Re: Fixing gcc 3.3 compile failures -- fix for games/battleball

2003-07-18 Thread Simon Barner

--- Makefile.orig   Fri Jul 18 17:46:10 2003
+++ MakefileFri Jul 18 17:46:39 2003
@@ -21,11 +21,9 @@
 MAKE_ENV=  PTHREAD_LIBS=${PTHREAD_LIBS} \
PTHREAD_CFLAGS=${PTHREAD_CFLAGS}
 
-.include bsd.port.pre.mk
+CFLAGS += -Wno-deprecated
 
-.if ${OSVERSION} = 500113
-BROKEN= Does not compile (bad C++ code)
-.endif
+.include bsd.port.pre.mk
 
 do-install:
@ ${INSTALL_PROGRAM} ${WRKSRC}/battleball ${PREFIX}/bin
--- lib3d/general.h.origFri Sep  3 04:25:19 1999
+++ lib3d/general.h Fri Jul 18 17:42:41 2003
@@ -25,9 +25,15 @@
 typedef unsigned int  uint;
 typedef unsigned long ulong;
 
+#ifdef __GNUC__
+#if __GNUC__  3
 #define and 
 #define or  ||
 #define not !
+#endif
+
+// TODO - what about non-GNU C++ compilers?
+#endif
 
 #define forii(limit) for (int i= 0; i limit; i++)
 #define forij(limit) for (int j= 0; j limit; j++)
--- lib3d/xform.h.orig  Fri Jul 18 17:28:08 2003
+++ lib3d/xform.h   Fri Jul 18 17:26:11 2003
@@ -64,6 +64,7 @@
 
 //===
 class tmtrx {
+  friend struct player;
   typedef double fourby3[4][3];
   fourby3 m;
 


signature.asc
Description: Digital signature


Re: Fixing gcc 3.3 compile failures -- fix for games/battleball

2003-07-18 Thread Sergey A. Osokin
On Fri, Jul 18, 2003 at 06:36:31PM +0200, Simon Barner wrote:
[patches skipped]

Committed with some modifications, thanks!
-- 

Rgdz,/\  ASCII RIBBON CAMPAIGN
Sergey Osokin aka oZZ,   \ /AGAINST HTML MAIL
http://ozz.pp.ru/ X  AND NEWS
 / \


pgp0.pgp
Description: PGP signature