Changeset 284 in kBuild for branches/GNU/src/gmake/w32/subproc

Timestamp:

May 16, 2005 4:54:08 PM (20 years ago)

Author:

bird

Message:

Current make snaphot, 2005-05-16.

Location:

branches/GNU/src/gmake/w32/subproc

Files:

• NMakefile (modified) (1 diff)
• sub_proc.c (modified) (4 diffs)
• w32err.c (modified) (1 diff)

branches/GNU/src/gmake/w32/subproc/NMakefile

@@ -24 +24 @@
 LIB = lib
 CC = cl
+MAKE = nmake
 
 OUTDIR=.

branches/GNU/src/gmake/w32/subproc/sub_proc.c

@@ -665 +665 @@
         HANDLE ready_hand;
         bool_t child_dead = FALSE;
-
+        BOOL GetExitCodeResult;
 
         /*
          *  Create stdin thread, if needed
          */
-    pproc->inp = stdin_data;
-    pproc->incnt = stdin_data_len;
+        pproc->inp = stdin_data;
+        pproc->incnt = stdin_data_len;
         if (!pproc->inp) {
                 stdin_eof = TRUE;
@@ -763 +763 @@
                 } else if (ready_hand == childhand) {
 
-                        if (GetExitCodeProcess(childhand, &pproc->exit_code) == FALSE) {
+                        GetExitCodeResult = GetExitCodeProcess(childhand, (DWORD*)&pproc->exit_code);
+                        if (GetExitCodeResult == FALSE) {
                                 pproc->last_err = GetLastError();
                                 pproc->lerrno = E_SCALL;
@@ -810 +811 @@
         HANDLE childhand;
         DWORD wait_return;
+        BOOL GetExitCodeResult;
 
         if (proc == NULL)
@@ -853 +855 @@
         }
 
-        if (GetExitCodeProcess(childhand, &pproc->exit_code) == FALSE) {
+        GetExitCodeResult = GetExitCodeProcess(childhand, (DWORD*)&pproc->exit_code);
+        if (GetExitCodeResult == FALSE) {
                 pproc->last_err = GetLastError();
                 pproc->lerrno = E_SCALL;

branches/GNU/src/gmake/w32/subproc/w32err.c

@@ -12 +12 @@
 char *
 map_windows32_error_to_string (DWORD ercode) {
-/* __declspec (thread) necessary if you will use multiple threads */
+/* __declspec (thread) necessary if you will use multiple threads on MSVC */
+#ifdef _MSC_VER
 __declspec (thread) static char szMessageBuffer[128];
-
+#else
+static char szMessageBuffer[128];
+#endif
         /* Fill message buffer with a default message in
          * case FormatMessage fails