Move Symbian cpp files to 'extra' folder;

add GC prefix to init_global_static_roots Symbian-special API function.

diff --git a/build/s60v3/libgc.mmp b/build/s60v3/libgc.mmp
index f707ab290243bbc4c53789ede0182e1e14001c83..efff7b0f340e99719722f7056139bf8738fb1b93 100644 (file)
--- a/build/s60v3/libgc.mmp
+++ b/build/s60v3/libgc.mmp
@@ -47,7 +47,7 @@ SOURCE          misc.c
 SOURCE          new_hblk.c
 SOURCE          obj_map.c
 SOURCE          os_dep.c
-SOURCE          symbian.cpp
+SOURCE          extra/symbian.cpp
 SOURCE          ptr_chck.c
 SOURCE          reclaim.c
 SOURCE          stubborn.c
@@ -69,4 +69,4 @@ LIBRARY         libc.lib
 LIBRARY euser.lib
 LIBRARY efsrv.lib
 LIBRARY avkon.lib
-LIBRARY eikcore.lib
\ No newline at end of file
+LIBRARY eikcore.lib

diff --git a/global_end.cpp b/extra/global_end.cpp
similarity index 86%
rename from global_end.cpp
rename to extra/global_end.cpp
index 2980747e7c6debbeb67d0b0edecfbdd16f61f07b..3e2e6d5974aee21b4f4fdcd86bb7208cc92adc06 100644 (file)
--- a/global_end.cpp
+++ b/extra/global_end.cpp
@@ -1,3 +1,4 @@
+// Symbian-specific file.
 
 // INCLUDE FILES
 #include "private/gcconfig.h"

diff --git a/global_start.cpp b/extra/global_start.cpp
similarity index 86%
rename from global_start.cpp
rename to extra/global_start.cpp
index 1406a50805b2f8f9ff69b6fa17704e1444af943f..c6d67c3c8a3087b1197d6572a277e41a52fe45c9 100644 (file)
--- a/global_start.cpp
+++ b/extra/global_start.cpp
@@ -1,3 +1,4 @@
+// Symbian-specific file.
 
 // INCLUDE FILES
 #include "private/gcconfig.h"

diff --git a/init_global_static_roots.cpp b/extra/init_global_static_roots.cpp
similarity index 91%
rename from init_global_static_roots.cpp
rename to extra/init_global_static_roots.cpp
index cba50cad9a91818703883498929b5fa487e0ddd5..092d34151dfe27ee3731c90716753e06accfeb31 100644 (file)
--- a/init_global_static_roots.cpp
+++ b/extra/init_global_static_roots.cpp
@@ -1,3 +1,4 @@
+// Symbian-specific file.
 
 // INCLUDE FILES
 #include <e32def.h>
@@ -9,7 +10,7 @@
 extern "C" {
 #endif
 
-void init_global_static_roots()
+void GC_init_global_static_roots()
 {
         ptr_t dataStart = NULL;
         ptr_t dataEnd = NULL;

diff --git a/symbian.cpp b/extra/symbian.cpp
similarity index 100%
rename from symbian.cpp
rename to extra/symbian.cpp

diff --git a/include/gc.h b/include/gc.h
index f3958f96c69485a988106df6452a97d1a2d06d22..a78a4c4e75465fda774364ff3b39ea61f3ad1913 100644 (file)
--- a/include/gc.h
+++ b/include/gc.h
@@ -1572,6 +1572,10 @@ GC_API int GC_CALL GC_get_force_unmap_on_gcollect(void);
 /* This explicitly deallocates the heap.                */
 GC_API void GC_CALL GC_win32_free_heap(void);
 
+#if defined(__SYMBIAN32__)
+  void GC_init_global_static_roots(void);
+#endif
+
 #if defined(_AMIGA) && !defined(GC_AMIGA_MAKINGLIB)
   /* Allocation really goes through GC_amiga_allocwrapper_do.   */
   void *GC_amiga_realloc(void *, size_t);

diff --git a/include/init_global_static_roots.h b/include/init_global_static_roots.h
deleted file mode 100644 (file)
index 32fdce5..0000000
--- a/include/init_global_static_roots.h
+++ /dev/null
@@ -1,15 +0,0 @@
-
-#ifndef __INIT_GLOBAL_STATIC_ROOTS_H_
-#define __INIT_GLOBAL_STATIC_ROOTS_H_
-
-#ifdef __cplusplus
-  extern "C" {
-#endif
-
-void init_global_static_roots(void);
-
-#ifdef __cplusplus
-  }
-#endif
-
-#endif