* net.cc: Undefine NOERROR and DELETE to avoid compiler warnings.

* shared_info.h (CURR_SHARED_MAGIC): Update.
* spawn.cc (spawn_guts): Avoid copying one line command line argument if it
hasn't been filled out.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index f3f77e5..e05d959 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+2009-04-05  Christopher Faylor  <me+cygwin@cgf.cx>
+
+       * net.cc: Undefine NOERROR and DELETE to avoid compiler warnings.
+       * shared_info.h (CURR_SHARED_MAGIC): Update.
+       * spawn.cc (spawn_guts): Avoid copying one line command line argument
+       if it hasn't been filled out.
+
 2009-04-04  Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>
            Corinna Vinschen  <corinna@vinschen.de>
 

diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc
index 4ea6ffe..cb0a5cd 100644 (file)
--- a/winsup/cygwin/net.cc
+++ b/winsup/cygwin/net.cc
@@ -14,6 +14,12 @@ details. */
 #define  __INSIDE_CYGWIN_NET__
 
 #include "winsup.h"
+
+/* unfortunately defined in windows header file but used in
+   cygwin header files too */
+#undef NOERROR
+#undef DELETE
+
 #include "miscfuncs.h"
 #include <ctype.h>
 #include <wchar.h>

diff --git a/winsup/cygwin/shared_info.h b/winsup/cygwin/shared_info.h
index e332829..bf4be4e 100644 (file)
--- a/winsup/cygwin/shared_info.h
+++ b/winsup/cygwin/shared_info.h
@@ -31,7 +31,7 @@ public:
 
 #define SHARED_INFO_CB 39328
 
-#define CURR_SHARED_MAGIC 0x22f9ff0bU
+#define CURR_SHARED_MAGIC 0x398d8baU
 
 #define USER_VERSION   1       // increment when mount table changes and
 #define USER_VERSION_MAGIC CYGWIN_VERSION_MAGIC (USER_MAGIC, USER_VERSION)

diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
index cd80e18..a957278 100644 (file)
--- a/winsup/cygwin/spawn.cc
+++ b/winsup/cygwin/spawn.cc
@@ -417,7 +417,10 @@ spawn_guts (const char *prog_arg, const char *const *argv,
        VerifyHandle (moreinfo->myself_pinfo);
     }
   WCHAR wone_line[one_line.ix + 1];
-  sys_mbstowcs (wone_line, one_line.ix + 1, one_line.buf);
+  if (one_line.ix)
+    sys_mbstowcs (wone_line, one_line.ix + 1, one_line.buf);
+  else
+    wone_line[0] = L'\0';
 
   PROCESS_INFORMATION pi;
   pi.hProcess = pi.hThread = NULL;