$NetBSD: patch-ac,v 1.3 2004/04/17 20:40:45 snj Exp $

--- lib3d/general.h.orig	2004-04-17 13:31:57.000000000 -0700
+++ lib3d/general.h	2004-04-17 13:33:01.000000000 -0700
@@ -25,9 +25,11 @@ typedef unsigned char uchar;
 typedef unsigned int  uint;
 typedef unsigned long ulong;
 
+#if defined(__GNUC__) && __GNUC__ < 3
 #define and &&
 #define or  ||
 #define not !
+#endif
 
 #define forii(limit) for (int i= 0; i <limit; i++)
 #define forij(limit) for (int j= 0; j <limit; j++)