Changeset 3861 for trunk/libc/include/InnoTekLIBC/fork.h

Timestamp:

Jun 26, 2014, 2:12:11 PM (11 years ago)

Author:

bird

Message:

More watcom compilation changes & fixes.

File:

• trunk/libc/include/InnoTekLIBC/fork.h (modified) (2 diffs)

trunk/libc/include/InnoTekLIBC/fork.h

@@ -525 +525 @@
  * @param   pfnCallback     Callback function. See __LIBC_PFNFORKCALLBACK for prototype.
  */
-#ifdef __WATCOMC__
-# define _FORK_PARENT1(uPriority, pfnCallback) \
-    static const __LIBC_FORKCALLBACK _FORK_DATA_USED() __fork_parent1_##pfnCallback = { pfnCallback, uPriority }; \
-    const __LIBC_FORKCALLBACK * __based(__segname("forkpar1")) __fork_parent1_ptr_##pfnCallback = &__fork_parent1_##pfnCallback
-
-#elif defined(_MSC_VER)
-# define _FORK_PARENT1(uPriority, pfnCallback) \
-    __Pragma(section("forkpar1", read, write)); \
-    static const __LIBC_FORKCALLBACK _FORK_DATA_USED() __fork_parent1_##pfnCallback = { pfnCallback, uPriority }; \
-    const __LIBC_FORKCALLBACK * __declspec(allocate("forkpar1")) __fork_parent1_ptr_##pfnCallback = &__fork_parent1_##pfnCallback
-
-#else
-# define _FORK_PARENT1(uPriority, pfnCallback) \
-    static const __LIBC_FORKCALLBACK _FORK_DATA_USED() __fork_parent1_##pfnCallback = \
-    { pfnCallback, uPriority + (unsigned)(&__fork_parent1_##pfnCallback - &__fork_parent1_##pfnCallback) }; \
-    __asm__ (".stabs \"___fork_parent1__\", 23, 0, 0, ___fork_parent1_" #pfnCallback)
-#endif
 
 /** @def _FORK_CHILD1
@@ -552 +535 @@
  * @param   pfnCallback     Callback function. See __LIBC_PFNFORKCALLBACK for prototype.
  */
-#ifdef __WATCOMC__
-# define _FORK_CHILD1(uPriority, pfnCallback) \
+#ifdef __OS2__
+# ifdef __WATCOMC__
+#  define _FORK_PARENT1(uPriority, pfnCallback) \
+    static const __LIBC_FORKCALLBACK _FORK_DATA_USED() __fork_parent1_##pfnCallback = { pfnCallback, uPriority }; \
+    const __LIBC_FORKCALLBACK * __based(__segname("SET2___fork_parent1__")) __fork_parent1_ptr_##pfnCallback = &__fork_parent1_##pfnCallback
+#  define _FORK_CHILD1(uPriority, pfnCallback) \
+    static const __LIBC_FORKCALLBACK _FORK_DATA_USED() __fork_parent1_##pfnCallback = { pfnCallback, uPriority }; \
+    const __LIBC_FORKCALLBACK * __based(__segname("SET2___fork_child1__")) __fork_parent1_ptr_##pfnCallback = &__fork_parent1_##pfnCallback
+# else
+#  define _FORK_PARENT1(uPriority, pfnCallback) \
+    static const __LIBC_FORKCALLBACK _FORK_DATA_USED() __fork_parent1_##pfnCallback = \
+    { pfnCallback, uPriority + (unsigned)(&__fork_parent1_##pfnCallback - &__fork_parent1_##pfnCallback) }; \
+    __asm__ (".stabs \"___fork_parent1__\", 23, 0, 0, ___fork_parent1_" #pfnCallback)
+#  define _FORK_CHILD1(uPriority, pfnCallback) \
+    static const __LIBC_FORKCALLBACK _FORK_DATA_USED() __fork_child1_##pfnCallback  = { pfnCallback, uPriority + (unsigned)(&__fork_child1_##pfnCallback - &__fork_child1_##pfnCallback) }; \
+    __asm__ (".stabs \"___fork_child1__\",  23, 0, 0, ___fork_child1_" #pfnCallback )
+# endif
+
+#elif defined(__NT__) || defined(__WIN32__) || defined(__WIN64__)
+# ifdef __WATCOMC__
+#  define _FORK_PARENT1(uPriority, pfnCallback) \
+    static const __LIBC_FORKCALLBACK _FORK_DATA_USED() __fork_parent1_##pfnCallback = { pfnCallback, uPriority }; \
+    const __LIBC_FORKCALLBACK * __based(__segname("forkpar1")) __fork_parent1_ptr_##pfnCallback = &__fork_parent1_##pfnCallback
+#  define _FORK_CHILD1(uPriority, pfnCallback) \
     static const __LIBC_FORKCALLBACK _FORK_DATA_USED() __fork_child1_##pfnCallback = { pfnCallback, uPriority }; \
     const __LIBC_FORKCALLBACK * __based(__segname("forkcld1")) __fork_child1_ptr_##pfnCallback = &__fork_child1_##pfnCallback
 
-#elif defined(_MSC_VER)
-# define _FORK_CHILD1(uPriority, pfnCallback) \
+# elif defined(_MSC_VER)
+#  define _FORK_PARENT1(uPriority, pfnCallback) \
     __Pragma(section("forkpar1", read, write)); \
+    static const __LIBC_FORKCALLBACK _FORK_DATA_USED() __fork_parent1_##pfnCallback = { pfnCallback, uPriority }; \
+    const __LIBC_FORKCALLBACK * __declspec(allocate("forkpar1")) __fork_parent1_ptr_##pfnCallback = &__fork_parent1_##pfnCallback
+#  define _FORK_CHILD1(uPriority, pfnCallback) \
+    __Pragma(section("forkcld1", read, write)); \
     static const __LIBC_FORKCALLBACK _FORK_DATA_USED() __fork_child1_##pfnCallback = { pfnCallback, uPriority }; \
     const __LIBC_FORKCALLBACK * __declspec(allocate("forkcld1")) __fork_child1_ptr_##pfnCallback = &__fork_child1_##pfnCallback
 
+# else
+#  error "Port me"
+# endif
 #else
-# define _FORK_CHILD1(uPriority, pfnCallback) \
-    static const __LIBC_FORKCALLBACK _FORK_DATA_USED() __fork_child1_##pfnCallback  = { pfnCallback, uPriority + (unsigned)(&__fork_child1_##pfnCallback - &__fork_child1_##pfnCallback) }; \
-    __asm__ (".stabs \"___fork_child1__\",  23, 0, 0, ___fork_child1_" #pfnCallback )
+# error "Port me"
 #endif