diff options
| author | Ivan Maidanski <ivmai@mail.ru> | 2012-03-18 17:50:45 +0400 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2012-03-18 17:50:45 +0400 |
| commit | d09dac8205a668cc9778689b89b18514cc76392f (patch) | |
| tree | 97da23e9f8af476ca8cc46ddbc4a11a7857efe73 | |
| parent | ea176a3ab6d5af6e14e7e035f9e75f2668b453c9 (diff) | |
| download | bdwgc-d09dac8205a668cc9778689b89b18514cc76392f.tar.gz | |
Move Symbian cpp files to 'extra' folder;
add GC prefix to init_global_static_roots Symbian-special API function.
| -rw-r--r-- | build/s60v3/libgc.mmp | 4 | ||||
| -rw-r--r-- | extra/global_end.cpp (renamed from global_end.cpp) | 1 | ||||
| -rw-r--r-- | extra/global_start.cpp (renamed from global_start.cpp) | 1 | ||||
| -rw-r--r-- | extra/init_global_static_roots.cpp (renamed from init_global_static_roots.cpp) | 3 | ||||
| -rw-r--r-- | extra/symbian.cpp (renamed from symbian.cpp) | 0 | ||||
| -rw-r--r-- | include/gc.h | 4 | ||||
| -rw-r--r-- | include/init_global_static_roots.h | 15 |
7 files changed, 10 insertions, 18 deletions
diff --git a/build/s60v3/libgc.mmp b/build/s60v3/libgc.mmp index f707ab29..efff7b0f 100644 --- 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 index 2980747e..3e2e6d59 100644 --- 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 index 1406a508..c6d67c3c 100644 --- 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 index cba50cad..092d3415 100644 --- 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 index 29a960d8..29a960d8 100644 --- a/symbian.cpp +++ b/extra/symbian.cpp diff --git a/include/gc.h b/include/gc.h index f3958f96..a78a4c4e 100644 --- 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 index 32fdce5c..00000000 --- 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 |