Date: Sat, 5 Oct 2002 12:49:08 -0400 (EDT) From: Craig Rodrigues <rodrigc@attbi.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: mwest@uct.ac.za, rodrigc@attbi.com Subject: ports/43717: devel/glui fixes for GCC 3.2 Message-ID: <200210051649.g95Gn8TP058114@dibbler.ne.client2.attbi.com>
next in thread | raw e-mail | index | archive | help
>Number: 43717
>Category: ports
>Synopsis: devel/glui fixes for GCC 3.2
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sat Oct 05 09:50:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Craig Rodrigues
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD dibbler.ne.client2.attbi.com 5.0-CURRENT FreeBSD 5.0-CURRENT #2: Sun Sep 8 09:39:46 EDT 2002 rodrigc@dibbler.ne.client2.attbi.com:/usr/obj/usr/src/sys/MYKERNEL1 i386
>Description:
>How-To-Repeat:
>Fix:
diff -urN glui.orig/files/patch-ac glui/files/patch-ac
--- glui.orig/files/patch-ac Wed Dec 31 19:00:00 1969
+++ glui/files/patch-ac Sat Oct 5 12:34:53 2002
@@ -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 *************/
diff -urN glui.orig/files/patch-ad glui/files/patch-ad
--- glui.orig/files/patch-ad Wed Dec 31 19:00:00 1969
+++ glui/files/patch-ad Sat Oct 5 12:40:18 2002
@@ -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 -urN glui.orig/files/patch-ae glui/files/patch-ae
--- glui.orig/files/patch-ae Wed Dec 31 19:00:00 1969
+++ glui/files/patch-ae Sat Oct 5 12:40:50 2002
@@ -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 -urN glui.orig/files/patch-af glui/files/patch-af
--- glui.orig/files/patch-af Wed Dec 31 19:00:00 1969
+++ glui/files/patch-af Sat Oct 5 12:43:02 2002
@@ -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 -urN glui.orig/files/patch-ag glui/files/patch-ag
--- glui.orig/files/patch-ag Wed Dec 31 19:00:00 1969
+++ glui/files/patch-ag Sat Oct 5 12:41:00 2002
@@ -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 -urN glui.orig/files/patch-ah glui/files/patch-ah
--- glui.orig/files/patch-ah Wed Dec 31 19:00:00 1969
+++ glui/files/patch-ah Sat Oct 5 12:41:07 2002
@@ -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;
+ }
+
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210051649.g95Gn8TP058114>