Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 322727 - JavaXPCOM on OS/2. patch by abwillis, r=jhpedemonte/mkaply. XULRunner only.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@212811 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pedemont%us.ibm.com
2006-09-28 18:41:55 +00:00
parent 4b066f6ce7
commit 644259a5e9
4 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/extensions/java/xpcom/src/Makefile.in
View File

@@ -69,8 +69,12 @@ LOCAL_INCLUDES = -I$(JAVA_INCLUDE_PATH)
ifeq ($(OS_ARCH),WINNT)
LOCAL_INCLUDES += -I$(JAVA_INCLUDE_PATH)/win32
else
ifeq ($(OS_ARCH),OS2)
LOCAL_INCLUDES += -I$(JAVA_INCLUDE_PATH)/OS2
else
LOCAL_INCLUDES += -I$(JAVA_INCLUDE_PATH)/linux
endif
endif
# Don't set JAVA_LIBRARY_NAME, since we don't want to build during 'libs'
# stage, but rather when explicitly called.

8
mozilla/extensions/java/xpcom/src/org/mozilla/xpcom/internal/JavaXPCOMMethods.java
View File

@@ -47,7 +47,13 @@ public class JavaXPCOMMethods {
if (aLibXULDirectory != null) {
path = aLibXULDirectory + File.separator;
}
System.load(path + System.mapLibraryName("javaxpcomglue"));
String osName = System.getProperty("os.name").toLowerCase();
if (osName.startsWith("os/2")) {
System.load(path + System.mapLibraryName("jxpcmglu"));
} else {
System.load(path + System.mapLibraryName("javaxpcomglue"));
}
registerJavaXPCOMMethodsNative(aLibXULDirectory);
}