fixed windows build

joeferner · joeferner · commit a4c17fed82df · 2012-05-31T17:59:44.000-04:00
diff --git a/lib/nodeJavaBridge.js b/lib/nodeJavaBridge.js
@@ -1,12 +1,13 @@
 'use strict';
 
 var path = require('path');
-var bindings = require("../build/Release/nodejavabridge_bindings");
+var binaryPath = path.resolve(path.join(__dirname, "../build/Release/nodejavabridge_bindings.node"));
+var bindings = require(binaryPath);
 
 var java = module.exports = new bindings.Java();
 java.classpath.push(__dirname + "/../commons-lang3-node-java.jar");
 java.classpath.push(__dirname + "/../src-java");
-java.nativeBindingLocation = path.resolve(path.join(__dirname, "../build/Release/nodejavabridge_bindings.node"));
+java.nativeBindingLocation = binaryPath;
 
 var MODIFIER_PUBLIC = 1;
 var MODIFIER_STATIC = 8;
diff --git a/src/java.cpp b/src/java.cpp
@@ -12,15 +12,15 @@ long v8ThreadId;
 /*static*/ v8::Persistent<v8::FunctionTemplate> Java::s_ct;
 
 void my_sleep(int dur) {
-#ifdef WINDOWS
+#ifdef WIN32
   Sleep(dur);
 #else
   usleep(dur);
 #endif
 }
 
 long my_getThreadId() {
-#ifdef WINDOWS
+#ifdef WIN32
   return (long)GetCurrentThreadId();
 #else
   return (long)pthread_self();
