Skip to content

Commit 11b965d

Browse files
committed
more windows work
1 parent c953917 commit 11b965d

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

mnm.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,12 @@ ociLibDir = process.env["OCI_LIB_DIR"] || "/usr/lib/oracle/11.2/client/lib/";
1515
builder.failIfNotExists(ociLibDir, 'Could not find "%s" check OCI_LIB_DIR environment variable.');
1616
builder.appendLinkerSearchDir(ociLibDir);
1717

18-
builder.appendLinkerLibrary("occi");
19-
builder.appendLinkerLibrary("clntsh");
18+
if(process.platform == 'win32') {
19+
builder.appendLinkerLibrary("oci");
20+
} else {
21+
builder.appendLinkerLibrary("occi");
22+
builder.appendLinkerLibrary("clntsh");
23+
}
2024
if (path.existsSync(path.join(ociLibDir, "libnnz10.dylib"))
2125
|| path.existsSync(path.join(ociLibDir, "libnnz10.so"))) {
2226
builder.appendLinkerLibrary("nnz10");

src/executeBaton.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ExecuteBaton::~ExecuteBaton() {
4040
}
4141

4242
double CallDateMethod(v8::Local<v8::Date> date, const char* methodName) {
43-
Handle<Value> args[0];
43+
Handle<Value> args[1]; // should be zero but on windows the compiler will not allow a zero length array
4444
Local<Value> result = Local<Function>::Cast(date->Get(String::New(methodName)))->Call(date, 0, args);
4545
return Local<Number>::Cast(result)->Value();
4646
}

0 commit comments

Comments
 (0)