diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index f8588e91d4e38f899a8c82284a21b0385dd8d1e2..fe72330740fbb0e670b96020b58ce6c76e7d17ad 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-06  Andrew Pinski  <apinski@apple.com>
+
+	* os-dep.c (GC_task_self): Declare as static
+	and remove the second declaration.
+
 2004-06-20  Andreas Tobler  <a.tobler@schweiz.ch>
 
 	* Makefile.am: Add rule for .S files to fix bootstrap on
diff --git a/boehm-gc/os_dep.c b/boehm-gc/os_dep.c
index fd195e1c806c6b9acdfa775fd4d0b4a5d584b984..2defc7174a1fedf460d1859327668bf6825a6874 100644
--- a/boehm-gc/os_dep.c
+++ b/boehm-gc/os_dep.c
@@ -2137,7 +2137,7 @@ GC_bool is_ptrfree;
     /* Using vm_protect (mach syscall) over mprotect (BSD syscall) seems to
        decrease the likelihood of some of the problems described below. */
     #include <mach/vm_map.h>
-    extern mach_port_t GC_task_self;
+    static mach_port_t GC_task_self;
     #define PROTECT(addr,len) \
         if(vm_protect(GC_task_self,(vm_address_t)(addr),(vm_size_t)(len), \
                 FALSE,VM_PROT_READ) != KERN_SUCCESS) { \
@@ -3312,8 +3312,6 @@ extern kern_return_t exception_raise_state_identity(
 
 #define MAX_EXCEPTION_PORTS 16
 
-static mach_port_t GC_task_self;
-
 static struct {
     mach_msg_type_number_t count;
     exception_mask_t      masks[MAX_EXCEPTION_PORTS];