Some cleanup, and update to new mozilla source. In particular:
- Removed #if 0 code in genproxy.c and elsewhere.
- Used jlong_* macros for portability (and defined in xpjava.h if not
elsewhere)
- Commented out calls to PR_Atomic{In,De}crement in JSSample.cpp, and began
to use "official" XPCOM macros.
- Removed Java interfaces for test components; will be autogenerated by
xpidl and/or genproxy.
- Extend genproxy to generate interfaces.
- Updated README with note on the jni.h problem
git-svn-id: svn://10.0.0.236/trunk@47409 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -720,10 +720,11 @@ extern jobject VariantToJObject(JNIEnv *env, const nsXPTCVariant *current) {
|
||||
nsresult InitXPCOM() {
|
||||
nsresult res;
|
||||
|
||||
#ifdef DEBUG_frankm
|
||||
cerr << "Initializing XPCOM" << endl;
|
||||
#endif
|
||||
|
||||
// Autoregistration happens here. The rest of RegisterComponent() calls should happen
|
||||
// only for dlls not in the components directory.
|
||||
// Autoregistration magic. Boogeda boogeda.
|
||||
|
||||
nsComponentManager::AutoRegister(nsIComponentManager::NS_Startup, nsnull);
|
||||
|
||||
@@ -746,7 +747,9 @@ nsresult InitXPCOM() {
|
||||
|
||||
// Get InterfaceInfoManager
|
||||
|
||||
#ifdef DEBUG_frankm
|
||||
cerr << "Getting InterfaceInfoManager" << endl;
|
||||
#endif
|
||||
|
||||
interfaceInfoManager = XPTI_GetInterfaceInfoManager();
|
||||
|
||||
@@ -755,6 +758,10 @@ nsresult InitXPCOM() {
|
||||
return res;
|
||||
}
|
||||
|
||||
#ifdef DEBUG_frankm
|
||||
cerr << "XPCOM Initialized" << endl;
|
||||
#endif
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user