[Plib-cvs] plib/src/pui pu.cxx,1.61,1.62 puFilePicker.cxx,1.31,1.32 puFileSelector.cxx,1.32,1.33 puLocal.h,1.11,1.12

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

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

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


Index: pu.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/pu.cxx,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- pu.cxx	19 Sep 2002 23:32:57 -0000	1.61
+++ pu.cxx	30 Nov 2002 00:41:49 -0000	1.62
@@ -23,14 +23,12 @@
 
 #include "puLocal.h"
 
-#ifndef WIN32
-#  if defined(macintosh)
-#    include <agl.h>
-#  elif defined(__APPLE__)
+#if defined(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
 
 int puRefresh = TRUE ;
@@ -106,11 +104,11 @@
 {
 #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 ) ;

Index: puFilePicker.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puFilePicker.cxx,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- puFilePicker.cxx	21 Sep 2002 17:47:09 -0000	1.31
+++ puFilePicker.cxx	30 Nov 2002 00:41:49 -0000	1.32
@@ -45,7 +45,7 @@
 UL_RTTI_DEF1(puFilePicker,puDialogBox)
 
 
-#if defined(WIN32) && !defined(__CYGWIN__)
+#ifdef UL_MSVC
 #define DOTDOTSLASH "..\\"
 #define SLASH       "\\"
 #else
@@ -381,7 +381,7 @@
       listing.
     */
 
-#if defined(WIN32)
+#ifdef UL_WIN32
     if ( c1 >= 'a' && c1 <= 'z' )
       c1 = c1 - ('a'-'A') ;
     

Index: puFileSelector.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puFileSelector.cxx,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- puFileSelector.cxx	17 Oct 2002 12:04:58 -0000	1.32
+++ puFileSelector.cxx	30 Nov 2002 00:41:49 -0000	1.33
@@ -46,7 +46,7 @@
 UL_RTTI_DEF1(puFileSelector,puDialogBox)
 
 
-#if defined(WIN32) && !defined(__CYGWIN__)
+#ifdef UL_MSVC
 #define DOTDOTSLASH "..\\"
 #define SLASH       "\\"
 #else
@@ -95,7 +95,7 @@
 
 static bool is_slash ( char ch )
 {
-#if defined(WIN32)
+#ifdef UL_WIN32
   /* win32 can use back or forward slash */
   return ch == '\\' || ch == '/' ;
 #else
@@ -484,7 +484,7 @@
       listing.
     */
 
-#if defined(WIN32) && !defined(__CYGWIN__)
+#ifdef UL_MSVC
     if ( c1 >= 'a' && c1 <= 'z' )
       c1 = c1 - ('a'-'A') ;
     

Index: puLocal.h
===================================================================
RCS file: /cvsroot/plib/plib/src/pui/puLocal.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- puLocal.h	19 Sep 2002 23:32:58 -0000	1.11
+++ puLocal.h	30 Nov 2002 00:41:49 -0000	1.12
@@ -32,7 +32,7 @@
 #  ifdef FREEGLUT_IS_PRESENT
 #    include <GL/freeglut.h>
 #  else
-#    ifdef __APPLE__
+#    ifdef UL_MAC_OSX
 #      include <GLUT/glut.h>
 #    else
 #      include <GL/glut.h>