Mailing List Archive

Author: creamyg
Date: 2008-09-08 21:18:38 -0700 (Mon, 08 Sep 2008)
New Revision: 3846

Modified:
trunk/c_src/KinoSearch/Util/Compat/ProcessID.c
trunk/c_src/KinoSearch/Util/Compat/Sleep.c
Log:
Reverse the order of #ifdef tests in Compat files so that if Windows.h is
detected it gets used.


Modified: trunk/c_src/KinoSearch/Util/Compat/ProcessID.c
===================================================================
--- trunk/c_src/KinoSearch/Util/Compat/ProcessID.c 2008-09-09 02:03:36 UTC (rev 3845)
+++ trunk/c_src/KinoSearch/Util/Compat/ProcessID.c 2008-09-09 04:18:38 UTC (rev 3846)
@@ -1,33 +1,8 @@
#include "KinoSearch/Util/Compat/ProcessID.h"
#include "charmony.h"

-/********************************* UNIXEN *********************************/
-#if (defined(CHY_HAS_UNISTD_H) && defined(CHY_HAS_SIGNAL_H))
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <signal.h>
-#include <errno.h>
-
-int
-kino_PID_getpid(void)
-{
- return getpid();
-}
-
-chy_bool_t
-kino_PID_active(int pid)
-{
- if (kill(pid, 0) == 0)
- return true; /* signal succeeded, therefore pid active */
- if (errno != ESRCH)
- return true; /* an error other than "pid not found", thus active */
- else
- return false;
-}
-
/********************************* WINDOWS ********************************/
-#elif (defined(CHY_HAS_WINDOWS_H) && defined(CHY_HAS_PROCESS_H))
+#if (defined(CHY_HAS_WINDOWS_H) && defined(CHY_HAS_PROCESS_H))

#include <Windows.h>
#include <process.h>
@@ -60,6 +35,31 @@
return false;
}

+/********************************* UNIXEN *********************************/
+#elif (defined(CHY_HAS_UNISTD_H) && defined(CHY_HAS_SIGNAL_H))
+
+#include <sys/types.h>
+#include <unistd.h>
+#include <signal.h>
+#include <errno.h>
+
+int
+kino_PID_getpid(void)
+{
+ return getpid();
+}
+
+chy_bool_t
+kino_PID_active(int pid)
+{
+ if (kill(pid, 0) == 0)
+ return true; /* signal succeeded, therefore pid active */
+ if (errno != ESRCH)
+ return true; /* an error other than "pid not found", thus active */
+ else
+ return false;
+}
+
#else
#error "Can't find a known process ID API."
#endif /* OS switch. */

Modified: trunk/c_src/KinoSearch/Util/Compat/Sleep.c
===================================================================
--- trunk/c_src/KinoSearch/Util/Compat/Sleep.c 2008-09-09 02:03:36 UTC (rev 3845)
+++ trunk/c_src/KinoSearch/Util/Compat/Sleep.c 2008-09-09 04:18:38 UTC (rev 3846)
@@ -1,26 +1,26 @@
#include "KinoSearch/Util/Compat/Sleep.h"
#include "charmony.h"

-/********************************* UNIXEN *********************************/
-#ifdef CHY_HAS_UNISTD_H
+/********************************* WINDOWS ********************************/
+#ifdef CHY_HAS_WINDOWS_H

-#include <unistd.h>
+#include <windows.h>

void
kino_Sleep_sleep(unsigned int seconds)
{
- sleep(seconds);
+ Sleep(seconds * 1000);
}

-/********************************* WINDOWS ********************************/
-#elif defined(CHY_HAS_WINDOWS_H)
+/********************************* UNIXEN *********************************/
+#elif defined(CHY_HAS_UNISTD_H)

-#include <windows.h>
+#include <unistd.h>

void
kino_Sleep_sleep(unsigned int seconds)
{
- Sleep(seconds * 1000);
+ sleep(seconds);
}

#else


_______________________________________________
kinosearch-commits mailing list
kinosearch-commits@rectangular.com
http://www.rectangular.com/mailman/listinfo/kinosearch-commits