Index: ossp-pkg/js/ChangeLog
RCS File: /v/ossp/cvs/ossp-pkg/js/ChangeLog,v
rcsdiff -q -kk '-r1.5' '-r1.6' -u '/v/ossp/cvs/ossp-pkg/js/ChangeLog,v' 2>/dev/null
--- ChangeLog	2006/07/24 18:54:40	1.5
+++ ChangeLog	2006/07/24 19:04:50	1.6
@@ -13,6 +13,12 @@
 
   Changes between 1.6.20060722 and 1.6.20060723 (2006-07-22 to 2006-07-23)
 
+   o Consistently mark all OSSP bugfixes with a "/* BUGFIX */" tag on
+     the "#ifdef OSSP" line. This way one can more easily see what
+     are specific OSSP specific changes what should be taken over by
+     upstream vendor.
+     [Ralf S. Engelschall <rse@engelschall.com>]
+
    o Fix an incorrect argument type bug in jsfile.c related to a call to
      js_InflateString(). A "size_t *" has to be passed, not a "size_t".
      [Ralf S. Engelschall <rse@engelschall.com>]
Index: ossp-pkg/js/src/jsapi.c
RCS File: /v/ossp/cvs/ossp-pkg/js/src/jsapi.c,v
rcsdiff -q -kk '-r1.5' '-r1.6' -u '/v/ossp/cvs/ossp-pkg/js/src/jsapi.c,v' 2>/dev/null
--- jsapi.c	2006/07/24 18:38:26	1.5
+++ jsapi.c	2006/07/24 19:04:50	1.6
@@ -130,7 +130,7 @@
 
 static JSBool
 TryArgumentFormatter(JSContext *cx, const char **formatp, JSBool fromJS,
-#ifdef OSSP
+#ifdef OSSP /* BUGFIX */
                      jsval **vpp, va_list app)
 #else
                      jsval **vpp, va_list *app)
@@ -264,7 +264,7 @@
           default:
             format--;
             if (!TryArgumentFormatter(cx, &format, JS_TRUE, &sp,
-#ifdef OSSP
+#ifdef OSSP /* BUGFIX */
                                       ap)) {
 #else
                                       JS_ADDRESSOF_VA_LIST(ap))) {
@@ -371,7 +371,7 @@
           default:
             format--;
             if (!TryArgumentFormatter(cx, &format, JS_FALSE, &sp,
-#ifdef OSSP
+#ifdef OSSP /* BUGFIX */
                                       ap)) {
 #else
                                       JS_ADDRESSOF_VA_LIST(ap))) {
Index: ossp-pkg/js/src/jscntxt.c
RCS File: /v/ossp/cvs/ossp-pkg/js/src/jscntxt.c,v
rcsdiff -q -kk '-r1.3' '-r1.4' -u '/v/ossp/cvs/ossp-pkg/js/src/jscntxt.c,v' 2>/dev/null
--- jscntxt.c	2006/07/24 18:38:27	1.3
+++ jscntxt.c	2006/07/24 19:04:50	1.4
@@ -367,7 +367,7 @@
     return ((JSDHashNumber)JS_PTR_TO_UINT32(key->obj) >> JSVAL_TAGBITS) ^ key->id;
 }
 
-#ifdef OSSP
+#ifdef OSSP /* BUGFIX */
 JS_STATIC_DLL_CALLBACK(JSBool)
 #else
 JS_PUBLIC_API(JSBool)
Index: ossp-pkg/js/src/jsdtoa.c
RCS File: /v/ossp/cvs/ossp-pkg/js/src/jsdtoa.c,v
rcsdiff -q -kk '-r1.2' '-r1.3' -u '/v/ossp/cvs/ossp-pkg/js/src/jsdtoa.c,v' 2>/dev/null
--- jsdtoa.c	2006/07/22 20:31:56	1.2
+++ jsdtoa.c	2006/07/24 19:04:53	1.3
@@ -247,7 +247,7 @@
 #define word1(x)        JSDOUBLE_LO32(x)
 #define set_word1(x, y) JSDOUBLE_SET_LO32(x, y)
 
-#ifdef OSSP
+#ifdef OSSP /* BUGFIX */
 #define Storeinc(a,b,c) (*(a)++ = (b) << 16 | ((c) & 0xffff))
 #else
 #define Storeinc(a,b,c) (*(a)++ = (b) << 16 | (c) & 0xffff)
@@ -1830,7 +1830,7 @@
     }
 #ifdef Avoid_Underflow
     if (scale) {
-#ifdef OSSP
+#ifdef OSSP /* CLEANUP */
         rv0 = 0.; /* calm the compiler warning */
 #endif
         set_word0(rv0, Exp_1 - P*Exp_msk1);
Index: ossp-pkg/js/src/jsfile.c
RCS File: /v/ossp/cvs/ossp-pkg/js/src/jsfile.c,v
rcsdiff -q -kk '-r1.4' '-r1.5' -u '/v/ossp/cvs/ossp-pkg/js/src/jsfile.c,v' 2>/dev/null
--- jsfile.c	2006/07/24 18:54:41	1.4
+++ jsfile.c	2006/07/24 19:04:53	1.5
@@ -2277,7 +2277,7 @@
     sprintf(url, "file://%s", file->path);
     /* TODO: js_escape in jsstr.h may go away at some point */
 
-#ifdef OSSP
+#ifdef OSSP /* BUGFIX */
 {
     size_t len = strlen(url);
     urlChars = js_InflateString(cx, url, &len);
@@ -2871,18 +2871,18 @@
                     bytes = js_combinePath(cx, file->path, prop_name);
                     *vp = OBJECT_TO_JSVAL(js_NewFileObject(cx, bytes));
                     JS_free(cx, bytes);
-#ifdef OSSP
+#ifdef OSSP /* BUGFIX */
                     closedir(dir);
 #else
-                    PR_CloseDir(dir); /* XXX: bugfix */
+                    PR_CloseDir(dir);
 #endif
                     return JS_TRUE;
                 }
             }
-#ifdef OSSP
+#ifdef OSSP /* BUGFIX */
             closedir(dir);
 #else
-            PR_CloseDir(dir); /* XXX: bugfix */
+            PR_CloseDir(dir);
 #endif
         }
     }
Index: ossp-pkg/js/src/jsinterp.c
RCS File: /v/ossp/cvs/ossp-pkg/js/src/jsinterp.c,v
rcsdiff -q -kk '-r1.4' '-r1.5' -u '/v/ossp/cvs/ossp-pkg/js/src/jsinterp.c,v' 2>/dev/null
--- jsinterp.c	2006/07/24 18:38:27	1.4
+++ jsinterp.c	2006/07/24 19:04:53	1.5
@@ -920,7 +920,7 @@
         thisp = frame.thisp;
 
         id = ATOM_TO_JSID(cx->runtime->atomState.noSuchMethodAtom);
-#if JS_HAS_XML_SUPPORT
+#if defined(OSSP) /* BUGFIX */ && JS_HAS_XML_SUPPORT
         if (OBJECT_IS_XML(cx, thisp)) {
             JSXMLObjectOps *ops;
 
@@ -934,7 +934,7 @@
         } else {
 #endif
             ok = OBJ_GET_PROPERTY(cx, thisp, id, &v);
-#if JS_HAS_XML_SUPPORT
+#if defined(OSSP) /* BUGFIX */ && JS_HAS_XML_SUPPORT
         }
 #endif
         if (!ok)
@@ -1733,7 +1733,7 @@
     void *mark;
     jsbytecode *endpc, *pc2;
     JSOp op, op2;
-#ifdef OSSP
+#ifdef OSSP /* CLEANUP */
     const JSCodeSpec *cs = NULL;
 #else
     const JSCodeSpec *cs;
@@ -1742,7 +1742,7 @@
     JSAtom *atom;
     uintN argc, slot, attrs;
     jsval *vp, lval, rval, ltmp, rtmp;
-#ifdef OSSP
+#ifdef OSSP /* CLEANUP */
     jsid id = -1L;
 #else
     jsid id;
@@ -1758,7 +1758,7 @@
     JSFunction *fun;
     JSType type;
 #ifdef DEBUG
-#ifdef OSSP
+#ifdef OSSP /* CLEANUP */
     FILE *tracefp = NULL;
 #else
     FILE *tracefp;
@@ -5503,7 +5503,7 @@
         if (printable)
             js_ReportIsNotDefined(cx, printable);
         ok = JS_FALSE;
-#ifdef OSSP
+#ifdef OSSP /* CLEANUP */
         sp = NULL;
 #endif
         goto out;
Index: ossp-pkg/js/src/jspubtd.h
RCS File: /v/ossp/cvs/ossp-pkg/js/src/jspubtd.h,v
rcsdiff -q -kk '-r1.3' '-r1.4' -u '/v/ossp/cvs/ossp-pkg/js/src/jspubtd.h,v' 2>/dev/null
--- jspubtd.h	2006/07/24 18:38:27	1.3
+++ jspubtd.h	2006/07/24 19:04:53	1.4
@@ -580,7 +580,7 @@
 typedef JSBool
 (* JS_DLL_CALLBACK JSArgumentFormatter)(JSContext *cx, const char *format,
                                         JSBool fromJS, jsval **vpp,
-#ifdef OSSP
+#ifdef OSSP /* BUGFIX */
                                         va_list app);
 #else
                                         va_list *app);