0.8.21.7:

[sbcl.git] / src / runtime / globals.h

diff --git a/src/runtime/globals.h b/src/runtime/globals.h
index 13a0447..7c48249 100644 (file)
--- a/src/runtime/globals.h
+++ b/src/runtime/globals.h
@@ -16,6 +16,7 @@
 
 #include <sys/types.h>
 #include <unistd.h>
+#include "sbcl.h"
 #include "runtime.h"
 
 extern int foreign_function_call_active;
@@ -23,11 +24,11 @@ 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;
@@ -59,9 +60,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 */