Fix process.platform

diff --git a/src/node.cc b/src/node.cc
index 4dd1936..36a3f5c 100644 (file)
--- a/src/node.cc
+++ b/src/node.cc
@@ -1289,7 +1289,7 @@ Handle<Value> DLOpen(const v8::Arguments& args) {
 
     p = strrchr(sym, '.');
     if (p != NULL) {
-      *p = NULL;
+      *p = '\0';
     }
 
     size_t slen = strlen(sym);
@@ -1561,9 +1561,7 @@ static void Load(int argc, char *argv[]) {
 
 
   // process.platform
-#define xstr(s) str(s)
-#define str(s) #s
-  process->Set(String::NewSymbol("platform"), String::New(xstr(PLATFORM)));
+  process->Set(String::NewSymbol("platform"), String::New(PLATFORM));
 
   // process.argv
   int i, j;

diff --git a/wscript b/wscript
index cc900d3..7f024bf 100644 (file)
--- a/wscript
+++ b/wscript
@@ -289,7 +289,7 @@ def configure(conf):
     conf.env.append_value('CXXFLAGS', '-DHAVE_FDATASYNC=0')
 
   # platform
-  platform_def = '-DPLATFORM=' + conf.env['DEST_OS']
+  platform_def = '-DPLATFORM="' + conf.env['DEST_OS'] + '"'
   conf.env.append_value('CCFLAGS', platform_def)
   conf.env.append_value('CXXFLAGS', platform_def)
 
@@ -521,9 +521,9 @@ def build(bld):
     bld.install_files('${PREFIX}/lib', "build/default/libnode.*")
 
   def subflags(program):
-    x = { 'CCFLAGS'   : " ".join(program.env["CCFLAGS"])
-        , 'CPPFLAGS'  : " ".join(program.env["CPPFLAGS"])
-        , 'LIBFLAGS'  : " ".join(program.env["LIBFLAGS"])
+    x = { 'CCFLAGS'   : " ".join(program.env["CCFLAGS"]).replace('"', '\\"')
+        , 'CPPFLAGS'  : " ".join(program.env["CPPFLAGS"]).replace('"', '\\"')
+        , 'LIBFLAGS'  : " ".join(program.env["LIBFLAGS"]).replace('"', '\\"')
         , 'PREFIX'    : program.env["PREFIX"]
         }
     return x