Changeset 3156 for trunk/src/kmk/read.c

Timestamp:

Mar 18, 2018, 9:10:03 PM (7 years ago)

Author:

bird

Message:

kmk/win: Reworking child process handling. This effort will hopefully handle processor groups better and allow executing internal function off the main thread.

File:

• trunk/src/kmk/read.c (modified) (4 diffs)

trunk/src/kmk/read.c

@@ -33 +33 @@
 #ifdef WINDOWS32
 #include <windows.h>
-#include "sub_proc.h"
+# ifndef _MSC_VER
+#  ifndef CONFIG_NEW_WIN_CHILDREN
+#   include "sub_proc.h"
+#  else
+#   include "w32/winchildren.h"
+#  endif
+# endif
 #else  /* !WINDOWS32 */
 #ifndef _AMIGA
@@ -423 +429 @@
     }
 
+#ifdef _MSC_VER
+  ENULLLOOP (ebuf.fp, fopen (filename, "rN")); /* N == noinherit */
+#else
   ENULLLOOP (ebuf.fp, fopen (filename, "r"));
+#endif
 
   /* Save the error code so we print the right message later.  */
@@ -454 +464 @@
           const char *included = concat (3, include_directories[i],
                                          "/", filename);
+#ifdef _MSC_VER
+          ebuf.fp = fopen (included, "rN"); /* N == noinherit */
+#else
           ebuf.fp = fopen (included, "r");
+#endif
           if (ebuf.fp)
             {
@@ -496 +510 @@
   /* Set close-on-exec to avoid leaking the makefile to children, such as
      $(shell ...).  */
+#ifndef _MSC_VER /* not necessary, see fopen calls above. */
 #ifdef HAVE_FILENO
   CLOSE_ON_EXEC (fileno (ebuf.fp));
+#endif
 #endif