breakgen for 64-bit

java/java-runtime/src/com/intellij/rt/execution/application/AppMain.java

@@ -39,7 +39,12 @@ public class AppMain {
     final String osName = System.getProperty("os.name").toLowerCase();
     String libPath = null;
     if (osName.startsWith("windows")) {
-      libPath = binPath + "breakgen.dll";
+      if (System.getProperty("os.arch").equals("amd64")) {
+        libPath = binPath + "breakgen64.dll";
+      }
+      else {
+        libPath = binPath + "breakgen.dll";
+      }
     } else if (osName.startsWith("linux")) {
       if (System.getProperty("os.name").toLowerCase().equals("amd64")) {
         libPath = binPath + "libbreakgen64.so";

native/breakgen/AppMain.c

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
+#include <jni.h>
 #if defined(WIN32)
 #include <windows.h>
 #else
-#include <jni.h>
 #include <signal.h>
 #include <unistd.h>
 #include <stdlib.h>