merge r43183 from trunk for the getpagesize() fix when compiling with…

… ogl enabled on linux svn:revision:43186 svn:branch:STABLE svn:account:brlcad
BRL-CAD · Feb 9, 2011 · 0cff7dd · 0cff7dd
2 parents a213342 + 7cd15f8
commit 0cff7dd
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/libfb/if_ogl.c b/src/libfb/if_ogl.c
@@ -41,8 +41,15 @@
 /* needed to make getpagesize in unistd.h visible with C99/XOPEN
  * strictness. Needs to be before sys/types.h, but unistd has to be
  * after the GL stuff. */
-#define __BSD_VISIBLE 1
-#define __USE_BSD 1
+#ifndef __BSD_VISIBLE
+#  define __BSD_VISIBLE 1
+#endif
+#ifndef __USE_XOPEN
+#  define __USE_XOPEN 1
+#endif
+#ifndef __USE_BSD
+#  define __USE_BSD 1
+#endif
 
 #ifdef HAVE_SYS_TYPES_H
 #  include <sys/types.h>