Changeset 1804 for trunk/src/kmk/incdep.c

Timestamp:

Sep 21, 2008, 9:55:08 PM (17 years ago)

Author:

bird

Message:

incdep: windows build fixes and some adjustments.

File:

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

trunk/src/kmk/incdep.c

@@ -30 +30 @@
 *   Header Files                                                               *
 *******************************************************************************/
-/*#define PARSE_IN_WORKER*/
-
 #ifdef __OS2__
 # define INCL_BASE
@@ -64 +62 @@
 #ifdef WINDOWS32
 # include <io.h>
+# include <process.h>
 # include <Windows.h>
+# define PARSE_IN_WORKER
 #endif
 
@@ -194 +194 @@
 /* The handles to the worker threads. */
 #ifdef HAVE_PTHREAD
-static pthread_t incdep_threads[4];
+static pthread_t incdep_threads[2];
 #elif defined (WINDOWS32)
-static HANDLE incdep_threads[4];
+static HANDLE incdep_threads[2];
 #elif defined (__OS2__)
-static TID incdep_threads[4];
-#endif
-static unsigned incdep_num_threads = 1;
+static TID incdep_threads[2];
+#endif
+static unsigned incdep_num_threads;
 
 /* flag indicating whether the worker threads should terminate or not. */
@@ -537 +537 @@
       hThread = _beginthreadex (NULL, 128*1024, incdep_worker_windows,
                                 NULL, 0, &tid);
-      if (hThread != 0 && hThread != ~(uintptr_t)0)
+      if (hThread == 0 || hThread == ~(uintptr_t)0)
         fatal (f, _("_beginthreadex failed: err=%d"), errno);
       incdep_threads[i] = (HANDLE)hThread;