diff options
| author | Tilman Keskinoz <arved@FreeBSD.org> | 2002-11-28 19:01:17 +0000 |
|---|---|---|
| committer | Tilman Keskinoz <arved@FreeBSD.org> | 2002-11-28 19:01:17 +0000 |
| commit | 0f2064ac797ebc8696e576c0f1de0d08886072c9 (patch) | |
| tree | fcddba6365a776dd7a4e5aafa64f8524eb320d7f /devel | |
| parent | Define HAVE_MEMCPY and unbreak. (diff) | |
Fix Build on -CURRENT
PR: 43717
Submitted by: Craig Rodrigues <rodrigc@attbi.com>
Notes
Notes:
svn path=/head/; revision=71220
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/glui/files/patch-example1.cpp | 19 | ||||
| -rw-r--r-- | devel/glui/files/patch-example2.cpp | 17 | ||||
| -rw-r--r-- | devel/glui/files/patch-example3.cpp | 18 | ||||
| -rw-r--r-- | devel/glui/files/patch-example4.cpp | 18 | ||||
| -rw-r--r-- | devel/glui/files/patch-example5.cpp | 18 | ||||
| -rw-r--r-- | devel/glui/files/patch-glui.h | 30 |
6 files changed, 120 insertions, 0 deletions
diff --git a/devel/glui/files/patch-example1.cpp b/devel/glui/files/patch-example1.cpp new file mode 100644 index 000000000000..84d540e31a84 --- /dev/null +++ b/devel/glui/files/patch-example1.cpp @@ -0,0 +1,19 @@ +--- example1.cpp.orig Sat Oct 5 12:36:47 2002
++++ example1.cpp Sat Oct 5 12:37:20 2002
+@@ -85,7 +85,7 @@
+
+ /**************************************** main() ********************/
+
+-void main(int argc, char* argv[])
++int main(int argc, char* argv[])
+ {
+ /****************************************/
+ /* Initialize GLUT and create window */
+@@ -136,6 +136,7 @@
+ GLUI_Master.set_glutIdleFunc( myGlutIdle );
+
+ glutMainLoop();
++ return 0;
+ }
+
+
diff --git a/devel/glui/files/patch-example2.cpp b/devel/glui/files/patch-example2.cpp new file mode 100644 index 000000000000..bef9d489d1ce --- /dev/null +++ b/devel/glui/files/patch-example2.cpp @@ -0,0 +1,17 @@ +--- example2.cpp.orig Sat Oct 5 12:37:42 2002
++++ example2.cpp Sat Oct 5 12:38:06 2002
+@@ -181,7 +181,7 @@
+
+ /**************************************** main() ********************/
+
+-void main(int argc, char* argv[])
++int main(int argc, char* argv[])
+ {
+ /****************************************/
+ /* Initialize GLUT and create window */
+@@ -244,4 +244,5 @@
+ GLUI_Master.set_glutIdleFunc( myGlutIdle );
+
+ glutMainLoop();
++ return 0;
+ }
diff --git a/devel/glui/files/patch-example3.cpp b/devel/glui/files/patch-example3.cpp new file mode 100644 index 000000000000..32604ea36fe3 --- /dev/null +++ b/devel/glui/files/patch-example3.cpp @@ -0,0 +1,18 @@ +--- example3.cpp.orig Sat Oct 5 12:42:22 2002
++++ example3.cpp Sat Oct 5 12:42:39 2002
+@@ -263,7 +263,7 @@
+
+ /**************************************** main() ********************/
+
+-void main(int argc, char* argv[])
++int main(int argc, char* argv[])
+ {
+ /****************************************/
+ /* Initialize GLUT and create window */
+@@ -392,5 +392,6 @@
+
+ /**** Regular GLUT main loop ****/
+ glutMainLoop();
++ return 0;
+ }
+
diff --git a/devel/glui/files/patch-example4.cpp b/devel/glui/files/patch-example4.cpp new file mode 100644 index 000000000000..c7295f8d9f08 --- /dev/null +++ b/devel/glui/files/patch-example4.cpp @@ -0,0 +1,18 @@ +--- example4.cpp.orig Sat Oct 5 12:38:51 2002
++++ example4.cpp Sat Oct 5 12:39:16 2002
+@@ -253,7 +253,7 @@
+
+ /**************************************** main() ********************/
+
+-void main(int argc, char* argv[])
++int main(int argc, char* argv[])
+ {
+ /****************************************/
+ /* Initialize GLUT and create window */
+@@ -371,5 +371,6 @@
+ /**** Regular GLUT main loop ****/
+
+ glutMainLoop();
++ return 0;
+ }
+
diff --git a/devel/glui/files/patch-example5.cpp b/devel/glui/files/patch-example5.cpp new file mode 100644 index 000000000000..d220bb08bcce --- /dev/null +++ b/devel/glui/files/patch-example5.cpp @@ -0,0 +1,18 @@ +--- example5.cpp.orig Sat Oct 5 12:39:00 2002
++++ example5.cpp Sat Oct 5 12:39:35 2002
+@@ -310,7 +310,7 @@
+
+ /**************************************** main() ********************/
+
+-void main(int argc, char* argv[])
++int main(int argc, char* argv[])
+ {
+ /****************************************/
+ /* Initialize GLUT and create window */
+@@ -478,5 +478,6 @@
+ /**** Regular GLUT main loop ****/
+
+ glutMainLoop();
++ return 0;
+ }
+
diff --git a/devel/glui/files/patch-glui.h b/devel/glui/files/patch-glui.h new file mode 100644 index 000000000000..1da2487ff943 --- /dev/null +++ b/devel/glui/files/patch-glui.h @@ -0,0 +1,30 @@ +--- glui.h.orig Sat Oct 5 12:33:27 2002
++++ glui.h Sat Oct 5 12:34:09 2002
+@@ -295,8 +295,8 @@
+ parent_node= child_head = child_tail = next_sibling = prev_sibling = NULL;
+ };
+
+- friend GLUI_Rollout;
+- friend GLUI_Main;
++ friend class GLUI_Rollout;
++ friend class GLUI_Main;
+ };
+
+
+@@ -559,11 +559,11 @@
+
+ /********** Friend classes *************/
+
+- friend GLUI_Control;
+- friend GLUI_Rotation;
+- friend GLUI_Translation;
+- friend GLUI;
+- friend GLUI_Master_Object;
++ friend class GLUI_Control;
++ friend class GLUI_Rotation;
++ friend class GLUI_Translation;
++ friend class GLUI;
++ friend class GLUI_Master_Object;
+
+
+ /********** Misc functions *************/
|