[Plib-cvs] plib/src/js js.h,1.27,1.28 jsMacOS.cxx,1.1,1.2

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

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

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


Index: js.h
===================================================================
RCS file: /cvsroot/plib/plib/src/js/js.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- js.h	29 Nov 2002 19:39:48 -0000	1.27
+++ js.h	30 Nov 2002 00:41:49 -0000	1.28
@@ -50,7 +50,13 @@
 
 #if defined(JS_VERSION) && JS_VERSION >= 0x010000
 #  define JS_NEW
-#else
+#endif
+#endif
+
+#define JS_TRUE  1
+#define JS_FALSE 0
+
+#ifndef JS_RETURN
 
  /*
    We'll put these values in and that should
@@ -68,11 +74,6 @@
 
 #  define JS_RETURN (sizeof(struct JS_DATA_TYPE))
 #endif
-#endif
-
-#define JS_TRUE  1
-#define JS_FALSE 0
-
 
 class jsJoystick
 {

Index: jsMacOS.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/js/jsMacOS.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jsMacOS.cxx	29 Nov 2002 19:39:48 -0000	1.1
+++ jsMacOS.cxx	30 Nov 2002 00:41:49 -0000	1.2
@@ -23,7 +23,7 @@
 
 #include "js.h"
 
-#ifdef _JS_MACINTOSH
+#ifdef UL_MACINTOSH
 
 #define _JS_MAX_AXES 9