Date: Fri, 18 Jul 2003 18:36:31 +0200 From: Simon Barner <barner@in.tum.de> To: Kris Kennaway <kris@obsecurity.org> Cc: current@FreeBSD.org Subject: Re: Fixing gcc 3.3 compile failures -- fix for games/battleball Message-ID: <20030718163631.GB752@zi025.glhnet.mhn.de> In-Reply-To: <20030718025200.GA36893@rot13.obsecurity.org> References: <20030718025200.GA36893@rot13.obsecurity.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--x4pBfXISqBoDm8sr
Content-Type: multipart/mixed; boundary="yVhtmJPUSI46BTXb"
Content-Disposition: inline
--yVhtmJPUSI46BTXb
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
--yVhtmJPUSI46BTXb
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="Makefile.patch"
Content-Transfer-Encoding: quoted-printable
--- Makefile.orig Fri Jul 18 17:46:10 2003
+++ Makefile Fri Jul 18 17:46:39 2003
@@ -21,11 +21,9 @@
MAKE_ENV=3D PTHREAD_LIBS=3D"${PTHREAD_LIBS}" \
PTHREAD_CFLAGS=3D"${PTHREAD_CFLAGS}"
=20
-.include <bsd.port.pre.mk>
+CFLAGS +=3D -Wno-deprecated
=20
-.if ${OSVERSION} >=3D 500113
-BROKEN=3D "Does not compile (bad C++ code)"
-.endif
+.include <bsd.port.pre.mk>
=20
do-install:
@ ${INSTALL_PROGRAM} ${WRKSRC}/battleball ${PREFIX}/bin
--yVhtmJPUSI46BTXb
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch-lib3d-general.h"
Content-Transfer-Encoding: quoted-printable
--- lib3d/general.h.orig Fri 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;
=20
+#ifdef __GNUC__
+#if __GNUC__ < 3
#define and &&
#define or ||
#define not !
+#endif
+
+// TODO - what about non-GNU C++ compilers?
+#endif
=20
#define forii(limit) for (int i=3D 0; i <limit; i++)
#define forij(limit) for (int j=3D 0; j <limit; j++)
--yVhtmJPUSI46BTXb
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch-lib3d-xform.h"
Content-Transfer-Encoding: quoted-printable
--- 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 @@
=20
//=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D
class tmtrx {
+ friend struct player;
typedef double fourby3[4][3];
fourby3 m;
=20
--yVhtmJPUSI46BTXb--
--x4pBfXISqBoDm8sr
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (FreeBSD)
iD8DBQE/GCIOCkn+/eutqCoRArfOAKC+Fg4OdL8IElDG0QrP4sNHkyGYfwCfa5Ad
QJmPyxXjQ5PJJAHnRC5R13g=
=4niv
-----END PGP SIGNATURE-----
--x4pBfXISqBoDm8sr--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030718163631.GB752>