X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fglobals.h;h=e8dd9debb53bcdb2214ab029d4daf92f6dd8ebdf;hb=d04b59670ab69405c4115ea3caac99fd62a4b7ab;hp=495e8552083fd8593a1d399a9e7bde387e0bdc22;hpb=cab2c71bb1bb8a575d9eebdae335e731daa64183;p=sbcl.git

diff --git a/src/runtime/globals.h b/src/runtime/globals.h
index 495e855..e8dd9de 100644
--- a/src/runtime/globals.h
+++ b/src/runtime/globals.h
@@ -14,31 +14,41 @@
 
 #ifndef LANGUAGE_ASSEMBLY
 
+#include <sys/types.h>
+#include <unistd.h>
+#include "sbcl.h"
 #include "runtime.h"
 
 extern int foreign_function_call_active;
+extern boolean stop_the_world;
 
 extern lispobj *current_control_stack_pointer;
 extern lispobj *current_control_frame_pointer;
-#if !defined(__i386__)
+#if !defined(LISP_FEATURE_X86)
 extern lispobj *current_binding_stack_pointer;
 #endif
 
-#if !defined(__i386__)
+#if !defined(LISP_FEATURE_X86)
 /* FIXME: Why doesn't the x86 need this? */
 extern lispobj *dynamic_space_free_pointer;
 extern lispobj *current_auto_gc_trigger;
 #endif
 
 extern lispobj *current_dynamic_space;
+extern pid_t parent_pid;
+extern boolean stop_the_world;
 
 extern void globals_init(void);
 
-#else  LANGUAGE_ASSEMBLY
+#else /* LANGUAGE_ASSEMBLY */
 
 #ifdef mips
+#ifdef __linux__
+#define EXTERN(name,bytes) .globl name 
+#else
 #define EXTERN(name,bytes) .extern name bytes
 #endif
+#endif
 /**/
 #ifdef sparc
 #ifdef SVR4
@@ -54,9 +64,13 @@ extern void globals_init(void);
 #endif
 #endif
 #ifdef ppc
+#ifdef LISP_FEATURE_DARWIN
+#define EXTERN(name,bytes) .globl _/**/name
+#else
 #define EXTERN(name,bytes) .globl name 
 #endif
-#ifdef __i386__
+#endif
+#ifdef LISP_FEATURE_X86
 #ifdef __linux__
 /* I'm very dubious about this.  Linux hasn't used _ on external names
  * since ELF became prevalent - i.e. about 1996, on x86    -dan 20010125 */
@@ -66,6 +80,11 @@ extern void globals_init(void);
 #endif
 #endif
 
+/* FIXME : these sizes are, incidentally, bogus on Alpha.  But the
+ * EXTERN macro doesn't use its second arg anyway, so no immediate harm
+ * done   -dan 2002.05.07
+ */
+
 EXTERN(foreign_function_call_active, 4)
 
 EXTERN(current_control_stack_pointer, 4)
@@ -78,6 +97,6 @@ EXTERN(current_dynamic_space, 4)
 EXTERN(current_flags_register, 4)
 #endif
 
-#endif LANGUAGE_ASSEMBLY
+#endif /* LANGUAGE_ASSEMBLY */
 
-#endif _INCLUDED_GLOBALS_H_
+#endif /* _INCLUDED_GLOBALS_H_ */