Bug 327846 - Method names conflicting with Java keywords should have underscore prepended, not appended. Expand list of Java keywords. General cleanup. r=bsmedberg. xulrunner only

Original committer: pedemont%us.ibm.com
Original revision: 1.29
Original date: 2006/03/30 22:31:56

extensions/java/xpcom/src/nsJavaXPCOMBindingUtils.h

@@ -45,6 +45,8 @@
 #include "pldhash.h"
 #include "nsJavaXPTCStub.h"
 #include "nsAutoLock.h"
+#include "nsTHashtable.h"
+#include "nsHashKeys.h"
 
 //#define DEBUG_JAVAXPCOM
 //#define DEBUG_JAVAXPCOM_REFCNT
@@ -110,6 +112,8 @@ extern NativeToJavaProxyMap* gNativeToJavaProxyMap;
 class JavaToXPTCStubMap;
 extern JavaToXPTCStubMap* gJavaToXPTCStubMap;
 
+extern nsTHashtable<nsDepCharHashKey>* gJavaKeywords;
+
 // The Java garbage collector runs in a separate thread.  Since it calls the
 // finalizeProxy() function in nsJavaWrapper.cpp, we need to make sure that
 // all the structures touched by finalizeProxy() are multithread aware.