Added Mac-specific defines.

js/src/mininspr/prcpucfg.h

@@ -20,6 +20,7 @@
 #define nspr_cpucfg___
 
 #ifdef XP_MAC
+#include "prmacos.h"
 #undef  IS_LITTLE_ENDIAN
 #define IS_BIG_ENDIAN 1
 

js/src/mininspr/prmacos.cpp

@@ -0,0 +1,125 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+    prmacos.cpp
+
+	Mac OS Support functions for LiveConnect. Provides standard JNI JavaVM creation
+	functions, and strdup.
+	
+	by Patrick C. Beard.
+ */
+
+#include <string.h>
+#include <stdlib.h>
+#include <Errors.h>
+
+#include "prtypes.h"
+#include "prmacos.h"
+
+char* strdup(const char *str)
+{
+    char* dup = (char*) malloc(1 + strlen(str));
+    if (dup != NULL)
+	    strcpy(dup, str);
+    return dup;
+}
+
+#if defined(LIVECONNECT)
+
+#include "JavaSession.h"
+
+// Fake VM initialization
+
+jint JNICALL JNI_GetDefaultJavaVMInitArgs(void* args)
+{
+	if (args != NULL) {
+		JDK1_1InitArgs* initArgs = (JDK1_1InitArgs*)args;
+		memset(initArgs, 0, sizeof(JDK1_1InitArgs));
+		return 0;
+	}
+	return -1;
+}
+
+static JavaSession* theSession = NULL;
+static const JNIInvokeInterface_* theActualFunctions;
+static JNIInvokeInterface_ thePatchedFunctions;
+
+static jint MRJ_DestroyJavaVM(JavaVM* javaVM)
+{
+	// Restore the original functions.
+	javaVM->functions = theActualFunctions;
+
+	// Toss the Java session instead.
+	if (theSession != NULL) {
+		delete theSession;
+		theSession = NULL;
+		return 0;
+	}
+	return -1;
+}
+
+static void shutdownJava()
+{
+	// Toss the Java session.
+	if (theSession != NULL) {
+		delete theSession;
+		theSession = NULL;
+	}
+}
+
+jint JNICALL JNI_CreateJavaVM(JavaVM** outVM, JNIEnv ** outEnv, void* args)
+{
+	int result = -1;
+	*outVM = NULL;
+	*outEnv = NULL;
+
+	try {
+		if (theSession == NULL)
+			theSession = new JavaSession();
+		if (theSession == NULL)
+			throw(OSStatusException(memFullErr));
+		
+		// Make sure that the JavaSession is torn down at the end of execution.
+		// If the user chooses "Quit" from the file menu, this guarantees
+		// the shutdown will happen.
+		atexit(&shutdownJava);
+		
+		JNIEnv* env = theSession->getEnv();
+		JavaVM* javaVM = NULL;
+		result = env->GetJavaVM(&javaVM);
+		if (result == 0) {
+			*outEnv = env;
+			*outVM = javaVM;
+
+			// Patch the JavaVM so it won't actually destroy itself.
+			// If we don't do this, MRJ crashest at exit.
+			// The functions are restored when DestoryJavaVM is called.
+			theActualFunctions = javaVM->functions;
+			thePatchedFunctions = *theActualFunctions;
+			thePatchedFunctions.DestroyJavaVM = MRJ_DestroyJavaVM;
+			javaVM->functions = &thePatchedFunctions;
+		}
+	} catch (OSStatusException status) {
+		*outVM = NULL;
+		*outEnv = NULL;
+	}
+	return result;
+}
+
+#endif

js/src/mininspr/prmacos.h

@@ -0,0 +1,37 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#ifndef prmacos_h___
+#define prmacos_h___
+//
+// This file contains all changes and additions that need to be made to the
+// runtime for the Macintosh platform hosting the Metrowerks environment.
+// This file should only be included in Macintosh builds.
+//
+
+PR_BEGIN_EXTERN_C
+
+#include <stddef.h>
+
+extern void* reallocSmaller(void* block, size_t newSize);
+
+extern char* strdup(const char* str);
+
+PR_END_EXTERN_C
+
+#endif /* prmacos_h___ */