[Plib-cvs] plib/src/fnt fnt.h,1.13,1.14 fntTXF.cxx,1.17,1.18

[Steve B. <sj...@us...>]

Update of /cvsroot/plib/plib/src/fnt
In directory sc8-pr-cvs1:/tmp/cvs-serv1232/plib/src/fnt

Modified Files:
	fnt.h fntTXF.cxx 
Log Message:
Cleared up some compile errors...replaced more ad-hoc
ifdef's with UL_whatever tokens.


Index: fnt.h
===================================================================
RCS file: /cvsroot/plib/plib/src/fnt/fnt.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- fnt.h	26 Oct 2002 14:24:59 -0000	1.13
+++ fnt.h	30 Nov 2002 00:41:49 -0000	1.14
@@ -27,7 +27,7 @@
 
 #include "sg.h"
 
-#ifdef __APPLE__
+#ifdef UL_MAC_OSX
 #  include <OpenGL/gl.h>
 #else
 #  include <GL/gl.h>

Index: fntTXF.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/fnt/fntTXF.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- fntTXF.cxx	9 Nov 2002 21:27:21 -0000	1.17
+++ fntTXF.cxx	30 Nov 2002 00:41:49 -0000	1.18
@@ -24,25 +24,23 @@
 
 #include "fntLocal.h"
 
-#ifndef WIN32
-#  if defined(macintosh)
-#    include <agl.h>
-#  elif defined(__APPLE__)
+#ifdef UL_MACINTOSH
+#  include <agl.h>
+#elif defined(UL_MAC_OSX)
 #    include <OpenGL/CGLCurrent.h>
-#  else
-#    include <GL/glx.h>
-#  endif
+#else
+#  include <GL/glx.h>
 #endif
 
 static bool glIsValidContext ( void )
 {
 #if defined(CONSOLE)
   return true ;
-#elif defined(WIN32)
+#elif defined(UL_WIN32)
   return ( wglGetCurrentContext () != NULL ) ;
-#elif defined(macintosh)
+#elif defined(UL_MACINTOSH)
   return ( aglGetCurrentContext () != NULL ) ;
-#elif defined(__APPLE__)
+#elif defined(UL_MAC_OSX)
   return ( CGLGetCurrentContext () != NULL ) ;
 #else
   return ( glXGetCurrentContext () != NULL ) ;