[kaffe] CVS kaffe (dalibor): Made two symbols static to fix problems with darwin and dynamic libraries

[Kaffe CVS]

PatchSet 5126 
Date: 2004/08/31 10:38:12
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Made two symbols static to fix problems with darwin and dynamic libraries

2004-08-31  Dalibor Topic  <robilad at kaffe.org>

        * kaffe/kaffevm/kaffe-gc/gc-incremental.c:
        (gcStats) Moved over here and made static.
        (garbageman) Made static.

        * kaffe/kaffevm/kaffe-gc/gc-incremental.h:
        (gcStats) Removed.

        * kaffe/kaffevm/kaffe-gc/gc-mem.c
        (garbageman) Removed declaration.

        Reported by: Michael Franz <developer.franz at verizon.net>

Members: 
	ChangeLog:1.2682->1.2683 
	kaffe/kaffevm/kaffe-gc/gc-incremental.c:1.4->1.5 
	kaffe/kaffevm/kaffe-gc/gc-incremental.h:1.2->1.3 
	kaffe/kaffevm/kaffe-gc/gc-mem.c:1.3->1.4 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2682 kaffe/ChangeLog:1.2683
--- kaffe/ChangeLog:1.2682	Tue Aug 31 09:30:24 2004
+++ kaffe/ChangeLog	Tue Aug 31 10:38:12 2004
@@ -1,3 +1,17 @@
+2004-08-31  Dalibor Topic  <robilad at kaffe.org>
+
+	* kaffe/kaffevm/kaffe-gc/gc-incremental.c:
+	(gcStats) Moved over here and made static.
+	(garbageman) Made static.
+
+	* kaffe/kaffevm/kaffe-gc/gc-incremental.h:
+	(gcStats) Removed.
+
+	* kaffe/kaffevm/kaffe-gc/gc-mem.c
+	(garbageman) Removed declaration.
+
+	Reported by: Michael Franz <developer.franz at verizon.net>
+
 2004-08-31  Guilhem Lavaux  <guilhem at kaffe.org>
 
 	* kaffe/kaffevm/kaffe-gc/gc-incremental.c
Index: kaffe/kaffe/kaffevm/kaffe-gc/gc-incremental.c
diff -u kaffe/kaffe/kaffevm/kaffe-gc/gc-incremental.c:1.4 kaffe/kaffe/kaffevm/kaffe-gc/gc-incremental.c:1.5
--- kaffe/kaffe/kaffevm/kaffe-gc/gc-incremental.c:1.4	Tue Aug 31 09:30:26 2004
+++ kaffe/kaffe/kaffevm/kaffe-gc/gc-incremental.c	Tue Aug 31 10:38:15 2004
@@ -30,6 +30,19 @@
 #include "gc-refs.h"
 #include "jvmpi_kaffe.h"
 
+static struct _gcStats {
+        uint32  totalmem;
+        uint32  totalobj;
+        uint32  freedmem;
+        uint32  freedobj;
+        uint32  markedobj;
+        uint32  markedmem;
+        uint32  allocobj;
+        uint32  allocmem;
+        uint32  finalobj;
+        uint32  finalmem;
+} gcStats;
+
 /* Avoid recursively allocating OutOfMemoryError */
 #define OOM_ALLOCATING		((void *) -1)
 
@@ -45,7 +58,7 @@
 } gc_obj;
 
 /* XXX don't use these types ! */
-Hjava_lang_Thread* garbageman;
+static Hjava_lang_Thread* garbageman;
 static Hjava_lang_Thread* finalman;
 
 static gcList gclists[6];
@@ -209,8 +222,6 @@
 {
 	registerTypeByIndex(idx, walk, final, destroy, description);
 }
-
-struct _gcStats gcStats;
 
 static void startGC(Collector *gcif);
 static void finishGC(Collector *gcif);
Index: kaffe/kaffe/kaffevm/kaffe-gc/gc-incremental.h
diff -u kaffe/kaffe/kaffevm/kaffe-gc/gc-incremental.h:1.2 kaffe/kaffe/kaffevm/kaffe-gc/gc-incremental.h:1.3
--- kaffe/kaffe/kaffevm/kaffe-gc/gc-incremental.h:1.2	Mon Aug  2 10:45:02 2004
+++ kaffe/kaffe/kaffevm/kaffe-gc/gc-incremental.h	Tue Aug 31 10:38:15 2004
@@ -106,19 +106,6 @@
 #define	STOPWORLD()		jthread_suspendall()
 #define	RESUMEWORLD()		jthread_unsuspendall()
 
-extern struct _gcStats {
-        uint32  totalmem;
-        uint32  totalobj;
-        uint32  freedmem;
-        uint32  freedobj;
-        uint32  markedobj;
-        uint32  markedmem;
-        uint32  allocobj;
-        uint32  allocmem;
-        uint32  finalobj;
-        uint32  finalmem;
-} gcStats;
-
 void KaffeGC_WalkConservative(Collector* gcif, const void* base, uint32 size);
 void KaffeGC_WalkMemory(Collector* gcif, void* mem);
 
Index: kaffe/kaffe/kaffevm/kaffe-gc/gc-mem.c
diff -u kaffe/kaffe/kaffevm/kaffe-gc/gc-mem.c:1.3 kaffe/kaffe/kaffevm/kaffe-gc/gc-mem.c:1.4
--- kaffe/kaffe/kaffevm/kaffe-gc/gc-mem.c:1.3	Tue Aug 31 09:30:26 2004
+++ kaffe/kaffe/kaffevm/kaffe-gc/gc-mem.c	Tue Aug 31 10:38:15 2004
@@ -120,8 +120,6 @@
 int gc_system_alloc_cnt;
 #endif
 
-extern struct Hjava_lang_Thread* garbageman;
-
 #if !(defined(NDEBUG) || !defined(KAFFE_VMDEBUG))
 /* Magic constant used to mark blocks under gc's management */
 static const uint32 gc_magic = 0xD0DECADE;