Changeset 1484

Timestamp:

Sep 9, 2004, 4:51:29 AM (21 years ago)

Author:

bird

Message:

fixed problem after stuff was made const.

File:

• trunk/src/emx/include/InnoTekLIBC/fork.h (modified) (6 diffs, 1 prop)

trunk/src/emx/include/InnoTekLIBC/fork.h

@@ -58 +58 @@
     __LIBC_FORK_CTX_PARENT = 1,
     /** The callback is called in both parent and child contexts. */
-    __LIBC_FORK_CTX_BOTH = 2,
+    __LIBC_FORK_CTX_BOTH = 2
 } __LIBC_FORKCTX;
 
@@ -91 +91 @@
      * This normally just calling callback.
      */
-    __LIBC_FORK_OP_FORK_CHILD       = 0x40,
+    __LIBC_FORK_OP_FORK_CHILD       = 0x40
     /** Called on fork failure in the child to give a chance to cleanup
      * resources which are not automatically freed upon process termination.
@@ -494 +494 @@
     /* Priority of this callback */
     unsigned                uPriority;
+#if 0
     /** Pointer to self.
      * This is a hack to allow the callbacks to be static without gcc
@@ -499 +500 @@
      */
     const struct __libc_ForkCallback *pSelf;
+#endif
 } __LIBC_FORKCALLBACK, *__LIBC_PFORKCALLBACK;
 
@@ -512 +514 @@
  */
 #define _FORK_PARENT1(uPriority, pfnCallback) \
-    static const __LIBC_FORKCALLBACK __fork_parent1_##pfnCallback = { pfnCallback, uPriority, &__fork_parent1_##pfnCallback }; \
-    __asm__ (".stabs \"___fork_parent1__\", 25, 0, 0, ___fork_parent1_" #pfnCallback);
+    static const __LIBC_FORKCALLBACK __fork_parent1_##pfnCallback = { pfnCallback, uPriority + (unsigned)(&__fork_parent1_##pfnCallback - &__fork_parent1_##pfnCallback) }; \
+    __asm__ (".stabs \"___fork_parent1__\", 23, 0, 0, ___fork_parent1_" #pfnCallback);
 
 /** @def _FORK_CHILD1
@@ -525 +527 @@
  */
 #define _FORK_CHILD1(uPriority, pfnCallback) \
-    static const __LIBC_FORKCALLBACK __fork_child1_##pfnCallback  = { pfnCallback, uPriority, &__fork_child1_##pfnCallback  }; \
-    __asm__ (".stabs \"___fork_child1__\",  25, 0, 0, ___fork_child1_" #pfnCallback );
+    static const __LIBC_FORKCALLBACK __fork_child1_##pfnCallback  = { pfnCallback, uPriority + (unsigned)(&__fork_child1_##pfnCallback - &__fork_child1_##pfnCallback) }; \
+    __asm__ (".stabs \"___fork_child1__\",  23, 0, 0, ___fork_child1_" #pfnCallback );