Bug 369410 - Missing a couple of 'JNICALL' declarations. Fix indentation.

extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java

@@ -1049,19 +1049,19 @@ IXPCOMError {
 	public long wrapJavaObject(Object aJavaObject, String aIID) {
 		try {
 			return jxutils.wrapJavaObject(aJavaObject, aIID);
-    } catch (NullPointerException e) {
-      throw new XPCOMInitializationException("Must call " +
-          "Mozilla.getInstance().initialize() before using this method", e);
-    }
+		} catch (NullPointerException e) {
+			throw new XPCOMInitializationException("Must call " +
+					"Mozilla.getInstance().initialize() before using this method", e);
+		}
 	}
-	
+
 	public Object wrapXPCOMObject(long aXPCOMObject, String aIID) {
 		try {
 			return jxutils.wrapXPCOMObject(aXPCOMObject, aIID);
-    } catch (NullPointerException e) {
-      throw new XPCOMInitializationException("Must call " +
-          "Mozilla.getInstance().initialize() before using this method", e);
-    }
+		} catch (NullPointerException e) {
+			throw new XPCOMInitializationException("Must call " +
+					"Mozilla.getInstance().initialize() before using this method", e);
+		}
 	}
 
 }

extensions/java/xpcom/src/nsJavaInterfaces.cpp

@@ -357,7 +357,7 @@ MOZILLA_NATIVE(getNativeHandleFromAWT) (JNIEnv* env, jobject clazz,
   return handle;
 }
 
-extern "C" NS_EXPORT jlong
+extern "C" NS_EXPORT jlong JNICALL
 JXUTILS_NATIVE(wrapJavaObject) (JNIEnv* env, jobject, jobject aJavaObject,
                                 jstring aIID)
 {
@@ -388,7 +388,7 @@ JXUTILS_NATIVE(wrapJavaObject) (JNIEnv* env, jobject, jobject aJavaObject,
   return NS_REINTERPRET_CAST(jlong, xpcomObject);
 }
 
-extern "C" NS_EXPORT jobject
+extern "C" NS_EXPORT jobject JNICALL
 JXUTILS_NATIVE(wrapXPCOMObject) (JNIEnv* env, jobject, jlong aXPCOMObject,
                                  jstring aIID)
 {