OSSP CVS Repository

ossp - Difference in ossp-pkg/js/src/jsfile.c versions 1.5 and 1.6
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [History

ossp-pkg/js/src/jsfile.c 1.5 -> 1.6

--- jsfile.c     2006/07/24 19:04:53     1.5
+++ jsfile.c     2006/07/24 19:53:01     1.6
@@ -43,10 +43,6 @@
  */
 #if JS_HAS_FILE_OBJECT
 
-#ifdef OSSP
-#define XP_UNIX
-#endif
-
 #include "jsstddef.h"
 
 /* ----------------- Platform-specific includes and defines ----------------- */
@@ -95,6 +91,9 @@
 #include "jsscript.h"
 #include "jsstr.h"
 #include "jsutil.h" /* Added by JSIFY */
+#ifdef OSSP /* CLEANUP */
+#include "jsfile.h"
+#endif
 #include <string.h>
 
 /* NSPR dependencies */
@@ -2363,6 +2362,9 @@
 }
 
 /* Internal function, used for cases which NSPR file support doesn't cover */
+#ifdef OSSP /* CLEANUP */
+static
+#endif
 JSObject*
 js_NewFileObjectFromFILE(JSContext *cx, FILE *nativehandle, char *filename,
     int32 mode, JSBool open, JSBool randomAccess)
@@ -2475,7 +2477,11 @@
     FILE_APPEND             = -19,
     FILE_REPLACE            = -20,
     FILE_AUTOFLUSH          = -21,
+#ifdef OSSP /* BUGFIX */
+    FILE_ISNATIVE           = -22
+#else
     FILE_ISNATIVE           = -22,
+#endif
 };
 
 static JSPropertySpec file_props[] = {

CVSTrac 2.0.1