diff --git a/scripts/update_api.py b/scripts/update_api.py
index cdc1ba0f5..60ec37220 100644
--- a/scripts/update_api.py
+++ b/scripts/update_api.py
@@ -560,12 +560,12 @@ def mk_java():
     java_wrapper.write('#ifdef __cplusplus\n')
     java_wrapper.write('extern "C" {\n')
     java_wrapper.write('#endif\n\n')
-    java_wrapper.write('#ifdef _M_X64\n\n')
+    java_wrapper.write('#if defined(_M_X64) || defined(_AMD64_)\n\n')
     java_wrapper.write('#define GETLONGAELEMS(T,OLD,NEW)                                   \\\n')
     java_wrapper.write('  T * NEW = (T*) jenv->GetLongArrayElements(OLD, NULL);              \n')
     java_wrapper.write('#define RELEASELONGAELEMS(OLD,NEW)                                 \\\n')
     java_wrapper.write('  jenv->ReleaseLongArrayElements(OLD, (jlong *) NEW, JNI_ABORT);     \n\n')
-    java_wrapper.write('#else\n')
+    java_wrapper.write('#else\n\n')
     java_wrapper.write('#define GETLONGAELEMS(T,OLD,NEW)                                   \\\n')
     java_wrapper.write('  T * NEW = 0; {                                                   \\\n')
     java_wrapper.write('  jlong * temp = jenv->GetLongArrayElements(OLD, NULL);            \\\n')
@@ -577,7 +577,7 @@ def mk_java():
     java_wrapper.write('  }                                                                  \n\n')
     java_wrapper.write('#define RELEASELONGAELEMS(OLD,NEW)                                 \\\n')
     java_wrapper.write('  delete [] NEW;                                                     \n\n')
-    java_wrapper.write('#endif\n')
+    java_wrapper.write('#endif\n\n')
     pkg_str = get_component('java').package_name.replace('.', '_')
     for name, result, params in _dotnet_decls:
         java_wrapper.write('JNIEXPORT %s JNICALL Java_%s_Native_INTERNAL%s(JNIEnv * jenv, jclass cls' % (type2javaw(result), pkg_str, java_method_name(name)))