# 34082

r= rogerl
OS/2 bring up continues - VisualAge fixes

js/src/jslibmath.h

@@ -30,6 +30,17 @@
  * and other provisions required by the GPL.  If you do not delete
  * the provisions above, a recipient may use your version of this
  * file under either the NPL or the GPL.
+ *
+ * This Original Code has been modified by IBM Corporation.
+ * Modifications made by IBM described herein are
+ * Copyright (c) International Business Machines
+ * Corporation, 2000
+ *
+ * Modifications to Mozilla code or documentation
+ * identified per MPL Section 3.3
+ *
+ * Date             Modified by     Description of modification
+ * 04/20/2000       IBM Corp.      OS/2 VisualAge build.
  */
 
 /*
@@ -91,7 +102,11 @@
 #define fd_atan atan
 #define fd_atan2 atan2
 #define fd_ceil ceil
+#ifdef XP_OS2_VACPP    /* OS2TODO */
+#define fd_copysign 
+#else
 #define fd_copysign copysign
+#endif
 #define fd_cos cos
 #define fd_exp exp
 #define fd_fabs fabs

js/src/jstypes.h

@@ -30,6 +30,17 @@
  * and other provisions required by the GPL.  If you do not delete
  * the provisions above, a recipient may use your version of this
  * file under either the NPL or the GPL.
+ *
+ * This Original Code has been modified by IBM Corporation.
+ * Modifications made by IBM described herein are
+ * Copyright (c) International Business Machines
+ * Corporation, 2000
+ *
+ * Modifications to Mozilla code or documentation
+ * identified per MPL Section 3.3
+ *
+ * Date             Modified by     Description of modification
+ * 04/20/2000       IBM Corp.      OS/2 VisualAge build.
  */
 
 /*
@@ -116,8 +127,8 @@
 #define JS_EXPORT_API(__type) __type
 #define JS_EXTERN_DATA(__type) extern __type
 #define JS_EXPORT_DATA(__type) __type
-#define JS_DLL_CALLBACK
-#define JS_STATIC_DLL_CALLBACK(__x) __x _Optlink
+#define JS_DLL_CALLBACK  _Optlink
+#define JS_STATIC_DLL_CALLBACK(__x) __x JS_DLL_CALLBACK
 
 #else /* Unix */
 

js/src/liveconnect/jsj_JavaObject.c

@@ -30,6 +30,17 @@
  * and other provisions required by the GPL.  If you do not delete
  * the provisions above, a recipient may use your version of this
  * file under either the NPL or the GPL.
+ *
+ * This Original Code has been modified by IBM Corporation.
+ * Modifications made by IBM described herein are
+ * Copyright (c) International Business Machines
+ * Corporation, 2000
+ *
+ * Modifications to Mozilla code or documentation
+ * identified per MPL Section 3.3
+ *
+ * Date             Modified by     Description of modification
+ * 04/20/2000       IBM Corp.      OS/2 VisualAge build.
  */
 
 /*
@@ -304,7 +315,7 @@ jsj_DiscardJavaObjReflections(JNIEnv *jEnv)
 #endif
 }
 
-JS_DLL_CALLBACK JSBool
+JSBool JS_DLL_CALLBACK
 JavaObject_convert(JSContext *cx, JSObject *obj, JSType type, jsval *vp)
 {
     JavaObjectWrapper *java_wrapper;
@@ -524,7 +535,7 @@ done:
     return JS_TRUE;
 }
 
-JS_DLL_CALLBACK JSBool
+JSBool JS_DLL_CALLBACK
 JavaObject_getPropertyById(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
 {
     jobject java_obj;

js/src/liveconnect/jsj_method.c

@@ -30,6 +30,13 @@
  * and other provisions required by the GPL.  If you do not delete
  * the provisions above, a recipient may use your version of this
  * file under either the NPL or the GPL.
+ *
+ * This Original Code has been modified by IBM Corporation. Modifications made by IBM described herein
+ * are Copyright (c) International Business Machines Corporation, 2000.
+ * Modifications to Mozilla code or documentation identified per MPL Section 3.3
+ *
+ * Date             Modified by     Description of modification
+ * 04/20/2000       IBM Corp.      OS/2 VisualAge build.
  */
  
 /*
@@ -1663,7 +1670,7 @@ java_constructor_wrapper(JSContext *cx, JSJavaThreadState *jsj_env,
                                               class_descriptor, argc, argv, vp);
 }
 
-JS_DLL_CALLBACK JSBool
+JSBool JS_DLL_CALLBACK
 jsj_JavaConstructorWrapper(JSContext *cx, JSObject *obj,
                            uintN argc, jsval *argv, jsval *vp)
 {
@@ -1719,7 +1726,7 @@ static_method_wrapper(JSContext *cx, JSJavaThreadState *jsj_env,
                                     class_descriptor, argc, argv, vp);
 }
 
-JS_DLL_CALLBACK JSBool
+JSBool JS_DLL_CALLBACK
 jsj_JavaStaticMethodWrapper(JSContext *cx, JSObject *obj,
                             uintN argc, jsval *argv, jsval *vp)
 {
@@ -1750,7 +1757,7 @@ jsj_JavaStaticMethodWrapper(JSContext *cx, JSObject *obj,
     return result;
 }
 
-JS_DLL_CALLBACK JSBool
+JSBool JS_DLL_CALLBACK
 jsj_JavaInstanceMethodWrapper(JSContext *cx, JSObject *obj,
                               uintN argc, jsval *argv, jsval *vp)
 {

js/src/liveconnect/jsj_private.h

@@ -30,6 +30,17 @@
  * and other provisions required by the GPL.  If you do not delete
  * the provisions above, a recipient may use your version of this
  * file under either the NPL or the GPL.
+ *
+ * This Original Code has been modified by IBM Corporation.
+ * Modifications made by IBM described herein are
+ * Copyright (c) International Business Machines
+ * Corporation, 2000
+ *
+ * Modifications to Mozilla code or documentation
+ * identified per MPL Section 3.3
+ *
+ * Date             Modified by     Description of modification
+ * 04/20/2000       IBM Corp.      OS/2 VisualAge build.
  */
 
 /*
@@ -580,10 +591,10 @@ jsj_LogError(const char *error_msg);
 extern const JSErrorFormatString * 
 jsj_GetErrorMessage(void *userRef, const char *locale, const uintN errorNumber);
 
-JS_DLL_CALLBACK JSJHashNumber
+JSJHashNumber JS_DLL_CALLBACK
 jsj_HashJavaObject(const void *key, void* env);
 
-JS_DLL_CALLBACK intN
+intN JS_DLL_CALLBACK
 jsj_JavaObjectComparator(const void *v1, const void *v2, void *arg);
 
 extern JSJavaThreadState *

js/src/liveconnect/jsj_utils.c

@@ -30,6 +30,13 @@
  * and other provisions required by the GPL.  If you do not delete
  * the provisions above, a recipient may use your version of this
  * file under either the NPL or the GPL.
+ *
+ * This Original Code has been modified by IBM Corporation. Modifications made by IBM 
+ * described herein are Copyright (c) International Business Machines Corporation, 2000.
+ * Modifications to Mozilla code or documentation identified per MPL Section 3.3
+ *
+ * Date             Modified by     Description of modification
+ * 04/20/2000       IBM Corp.      OS/2 VisualAge build.
  */
 
 /*
@@ -50,7 +57,7 @@
  * This is a hash-table utility routine that computes the hash code of a Java
  * object by calling java.lang.System.identityHashCode()
  */
-JS_DLL_CALLBACK JSJHashNumber
+JSJHashNumber JS_DLL_CALLBACK
 jsj_HashJavaObject(const void *key, void* env)
 {
     JSHashNumber hash_code;
@@ -80,7 +87,7 @@ jsj_HashJavaObject(const void *key, void* env)
  * or handles (though they may be in some JVM implementations).  Instead,
  * use the JNI routine for comparing the two objects.
  */
-JS_DLL_CALLBACK intN
+intN JS_DLL_CALLBACK
 jsj_JavaObjectComparator(const void *v1, const void *v2, void *arg)
 {
     jobject java_obj1, java_obj2;

js/src/xpconnect/loader/mozJSComponentLoader.cpp

@@ -14,6 +14,13 @@
  * Communications Corporation.  Portions created by Netscape are
  * Copyright (C) 1999 Netscape Communications Corporation.  All Rights
  * Reserved.
+ *
+ * This Original Code has been modified by IBM Corporation. Modifications made by IBM 
+ * described herein are Copyright (c) International Business Machines Corporation, 2000.
+ * Modifications to Mozilla code or documentation identified per MPL Section 3.3
+ *
+ * Date             Modified by     Description of modification
+ * 04/20/2000       IBM Corp.      OS/2 VisualAge build.
  */
 
 #include "prlog.h"
@@ -57,7 +64,7 @@ const char kJSRuntimeServiceProgID[] = "nsJSRuntimeService";
 const char kXPConnectServiceProgID[] = "nsIXPConnect";
 const char kJSContextStackProgID[] =   "nsThreadJSContextStack";
 
-static JSBool
+static JSBool PR_CALLBACK
 Dump(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
     JSString *str;
@@ -106,7 +113,7 @@ mozJSComponentLoader::mozJSComponentLoader()
     NS_INIT_REFCNT();
 }
 
-static PR_CALLBACK PRIntn
+static PRIntn PR_CALLBACK
 UnrootGlobals(PLHashEntry *he, PRIntn i, void *arg)
 {
     JSContext *cx = (JSContext *)arg;
@@ -115,7 +122,7 @@ UnrootGlobals(PLHashEntry *he, PRIntn i, void *arg)
     return HT_ENUMERATE_REMOVE;
 }
 
-static PR_CALLBACK PRIntn
+static PRIntn PR_CALLBACK
 UnloadAndReleaseModules(PLHashEntry *he, PRIntn i, void *arg)
 {
     nsIModule *module = NS_STATIC_CAST(nsIModule *, he->value);
@@ -188,7 +195,7 @@ mozJSComponentLoader::GetFactory(const nsIID &aCID,
     return rv;
 }
 
-static void
+static void PR_CALLBACK
 Reporter(JSContext *cx, const char *message, JSErrorReport *rep)
 {
     nsresult rv;

js/src/xpconnect/shell/xpcshell.cpp

@@ -31,6 +31,13 @@
  * and other provisions required by the GPL.  If you do not delete
  * the provisions above, a recipient may use your version of this
  * file under either the NPL or the GPL.
+ *
+ * This Original Code has been modified by IBM Corporation. Modifications made by IBM 
+ * described herein are Copyright (c) International Business Machines Corporation, 2000.
+ * Modifications to Mozilla code or documentation identified per MPL Section 3.3
+ *
+ * Date             Modified by     Description of modification
+ * 04/20/2000       IBM Corp.      OS/2 VisualAge build.
  */
 
 /* XPConnect JavaScript interactive shell. */
@@ -91,7 +98,7 @@ FILE *gErrFile = NULL;
 int gExitCode = 0;
 JSBool gQuitting = JS_FALSE;
 
-static void
+static void PR_CALLBACK
 my_ErrorReporter(JSContext *cx, const char *message, JSErrorReport *report)
 {
     int i, j, k, n;
@@ -151,7 +158,7 @@ my_ErrorReporter(JSContext *cx, const char *message, JSErrorReport *report)
     JS_free(cx, prefix);
 }
 
-static JSBool
+static JSBool PR_CALLBACK
 Print(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
     uintN i, n;
@@ -169,7 +176,7 @@ Print(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
     return JS_TRUE;
 }
 
-static JSBool
+static JSBool PR_CALLBACK
 Dump(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
     JSString *str;
@@ -193,7 +200,7 @@ Dump(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
     return JS_TRUE;
 }
 
-static JSBool
+static JSBool PR_CALLBACK
 Load(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
     uintN i;
@@ -222,7 +229,7 @@ Load(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
     return JS_TRUE;
 }
 
-static JSBool
+static JSBool PR_CALLBACK
 Version(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
     if (argc > 0 && JSVAL_IS_INT(argv[0]))
@@ -232,14 +239,14 @@ Version(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
     return JS_TRUE;
 }
 
-static JSBool
+static JSBool PR_CALLBACK
 BuildDate(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
     fprintf(gOutFile, "built on %s at %s\n", __DATE__, __TIME__);
     return JS_TRUE;
 }
 
-static JSBool
+static JSBool PR_CALLBACK
 Quit(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
 #ifdef LIVECONNECT
@@ -254,7 +261,7 @@ Quit(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
     return JS_FALSE;
 }
 
-static JSBool
+static JSBool PR_CALLBACK
 DumpXPC(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
     int32 depth = 2;
@@ -274,7 +281,7 @@ DumpXPC(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 extern "C" JS_FRIEND_DATA(FILE *) js_DumpGCHeap;
 #endif
 
-static JSBool
+static JSBool PR_CALLBACK
 GC(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
     JSRuntime *rt;
@@ -369,7 +376,7 @@ JSErrorFormatString jsShell_ErrorFormatString[JSErr_Limit] = {
 #undef MSG_DEF
 };
 
-static const JSErrorFormatString *
+static const JSErrorFormatString * PR_CALLBACK
 my_GetErrorMessage(void *userRef, const char *locale, const uintN errorNumber)
 {
     if ((errorNumber > 0) && (errorNumber < JSShellErr_Limit))

js/src/xpconnect/src/xpcwrappednativeclass.cpp

@@ -31,12 +31,28 @@
  * and other provisions required by the GPL.  If you do not delete
  * the provisions above, a recipient may use your version of this
  * file under either the NPL or the GPL.
+ *
+ * This Original Code has been modified by IBM Corporation. Modifications made by IBM 
+ * described herein are Copyright (c) International Business Machines Corporation, 2000.
+ * Modifications to Mozilla code or documentation identified per MPL Section 3.3
+ *
+ * Date             Modified by     Description of modification
+ * 04/20/2000       IBM Corp.      OS/2 VisualAge build.
  */
 
 /* Class shared by all native interface instances. */
 
 #include "xpcprivate.h"
 
+// To kill #define index(a,b) strchr(a,b) macro in Toolkit types.h
+#ifdef XP_OS2_VACPP
+#if defined index
+#undef index
+//#define index index
+#endif
+#endif
+
+
 /***************************************************************************/
 XPCNativeMemberDescriptor::XPCNativeMemberDescriptor()
     : id(0), index(0), index2(0), argc(-1), flags(0) {}

js/src/xpconnect/tests/TestXPC.cpp

@@ -30,6 +30,13 @@
  * and other provisions required by the GPL.  If you do not delete
  * the provisions above, a recipient may use your version of this
  * file under either the NPL or the GPL.
+ *
+ * This Original Code has been modified by IBM Corporation. Modifications made by IBM 
+ * described herein are Copyright (c) International Business Machines Corporation, 2000.
+ * Modifications to Mozilla code or documentation identified per MPL Section 3.3
+ *
+ * Date             Modified by     Description of modification
+ * 04/20/2000       IBM Corp.      OS/2 VisualAge build.
  */
 
 /* API tests for XPConnect - use xpcshell for JS tests. */
@@ -64,7 +71,7 @@ static void SetupRegistry()
 FILE *gOutFile = NULL;
 FILE *gErrFile = NULL;
 
-static JSBool
+static JSBool PR_CALLBACK
 Print(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
     uintN i, n;
@@ -82,7 +89,7 @@ Print(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
     return JS_TRUE;
 }
 
-static JSBool
+static JSBool PR_CALLBACK
 Load(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
     uintN i;
@@ -123,7 +130,7 @@ static JSClass global_class = {
     JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   JS_FinalizeStub
 };
 
-static void
+static void PR_CALLBACK
 my_ErrorReporter(JSContext *cx, const char *message, JSErrorReport *report)
 {
     printf(message);