Remove gc_amiga_redirects.h (included internally) from public headers.

* Makefile.direct (SRCS): Remove gc_amiga_redirects.h.
* include/include.am (pkginclude_HEADERS): Ditto.
* windows-untested/vc60/gc.dsp (SOURCE): Ditto.
* windows-untested/vc60/libgc.dsp (SOURCE): Ditto.
* windows-untested/vc70/gc.vcproj (Header Files): Ditto.
* windows-untested/vc70/libgc.vcproj (Header Files): Ditto.
* windows-untested/vc71/gc.vcproj (Header Files): Ditto.
* windows-untested/vc71/libgc.vcproj (Header Files): Ditto.
* include/gc.h: Insert the contents of gc_amiga_redirects.h instead
of including it (only if _AMIGA and not GC_AMIGA_MAKINGLIB).
* include/gc.h (GC_amiga_realloc, GC_amiga_set_toany): Remove
"extern" keyword.
* include/gc.h (GC_amiga_allocwrapper_do): Add GC_CALL to the function
argument.
* include/gc.h (GC_amiga_realloc, GC_amiga_set_toany,
GC_amiga_allocwrapper_do): Remove identifiers for arguments from the
declaration.

diff --git a/Makefile.direct b/Makefile.direct
index 4d268096eba8037b6be6223c4ea0f029992ab905..d0e19de28e9f669395a6ccaae8ae0bba19a45e7b 100644 (file)
--- a/Makefile.direct
+++ b/Makefile.direct
@@ -100,7 +100,7 @@ SRCS= $(CSRCS) mips_sgi_mach_dep.s rs6000_mach_dep.s alpha_mach_dep.S \
     hpux_test_and_clear.s include/gc_gcj.h \
     include/private/dbg_mlc.h \
     include/private/specific.h \
-    include/leak_detector.h include/gc_amiga_redirects.h \
+    include/leak_detector.h \
     include/gc_pthread_redirects.h ia64_save_regs_in_stack.s \
     include/gc_config_macros.h include/private/pthread_support.h \
     include/private/pthread_stop_world.h include/private/darwin_semaphore.h \

diff --git a/include/gc.h b/include/gc.h
index ae7d046fdf6a0f009b439c0bddb63113e8d13d2f..19d61f064cb4a3b33ad340a84ee75b1ad9674a09 100644 (file)
--- a/include/gc.h
+++ b/include/gc.h
@@ -1440,9 +1440,27 @@ GC_API int GC_CALL GC_get_force_unmap_on_gcollect(void);
 GC_API void GC_CALL GC_win32_free_heap(void);
 
 #if defined(_AMIGA) && !defined(GC_AMIGA_MAKINGLIB)
-  /* Allocation really goes through GC_amiga_allocwrapper_do    */
-# include "gc_amiga_redirects.h"
-#endif
+  /* Allocation really goes through GC_amiga_allocwrapper_do.   */
+  void *GC_amiga_realloc(void *, size_t);
+# define GC_realloc(a,b) GC_amiga_realloc(a,b)
+  void GC_amiga_set_toany(void (*)(void));
+  extern int GC_amiga_free_space_divisor_inc;
+  extern void *(*GC_amiga_allocwrapper_do)(size_t, void *(GC_CALL *)(size_t));
+# define GC_malloc(a) \
+        (*GC_amiga_allocwrapper_do)(a,GC_malloc)
+# define GC_malloc_atomic(a) \
+        (*GC_amiga_allocwrapper_do)(a,GC_malloc_atomic)
+# define GC_malloc_uncollectable(a) \
+        (*GC_amiga_allocwrapper_do)(a,GC_malloc_uncollectable)
+# define GC_malloc_stubborn(a) \
+        (*GC_amiga_allocwrapper_do)(a,GC_malloc_stubborn)
+# define GC_malloc_atomic_uncollectable(a) \
+        (*GC_amiga_allocwrapper_do)(a,GC_malloc_atomic_uncollectable)
+# define GC_malloc_ignore_off_page(a) \
+        (*GC_amiga_allocwrapper_do)(a,GC_malloc_ignore_off_page)
+# define GC_malloc_atomic_ignore_off_page(a) \
+        (*GC_amiga_allocwrapper_do)(a,GC_malloc_atomic_ignore_off_page)
+#endif /* _AMIGA && !GC_AMIGA_MAKINGLIB */
 
 #ifdef __cplusplus
   }  /* end of extern "C" */

diff --git a/include/gc_amiga_redirects.h b/include/gc_amiga_redirects.h
deleted file mode 100644 (file)
index 9e975c8..0000000
--- a/include/gc_amiga_redirects.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef GC_AMIGA_REDIRECTS_H
-
-# define GC_AMIGA_REDIRECTS_H
-
-# if ( defined(_AMIGA) && !defined(GC_AMIGA_MAKINGLIB) )
-    extern void *GC_amiga_realloc(void *old_object,size_t new_size_in_bytes);
-#   define GC_realloc(a,b) GC_amiga_realloc(a,b)
-    extern void GC_amiga_set_toany(void (*func)(void));
-    extern int GC_amiga_free_space_divisor_inc;
-    extern void *(*GC_amiga_allocwrapper_do) \
-       (size_t size,void *(*AllocFunction)(size_t size2));
-#   define GC_malloc(a) \
-       (*GC_amiga_allocwrapper_do)(a,GC_malloc)
-#   define GC_malloc_atomic(a) \
-       (*GC_amiga_allocwrapper_do)(a,GC_malloc_atomic)
-#   define GC_malloc_uncollectable(a) \
-       (*GC_amiga_allocwrapper_do)(a,GC_malloc_uncollectable)
-#   define GC_malloc_stubborn(a) \
-       (*GC_amiga_allocwrapper_do)(a,GC_malloc_stubborn)
-#   define GC_malloc_atomic_uncollectable(a) \
-       (*GC_amiga_allocwrapper_do)(a,GC_malloc_atomic_uncollectable)
-#   define GC_malloc_ignore_off_page(a) \
-       (*GC_amiga_allocwrapper_do)(a,GC_malloc_ignore_off_page)
-#   define GC_malloc_atomic_ignore_off_page(a) \
-       (*GC_amiga_allocwrapper_do)(a,GC_malloc_atomic_ignore_off_page)
-# endif /* _AMIGA && !GC_AMIGA_MAKINGLIB */
-
-#endif /* GC_AMIGA_REDIRECTS_H */
-
-

diff --git a/include/include.am b/include/include.am
index 399e5420e8b3c78ef4bf5a0d6407cf79278cb619..9918c21adaa27273467f8b7c86f411fb96b63ee0 100644 (file)
--- a/include/include.am
+++ b/include/include.am
@@ -17,42 +17,41 @@
 # installed headers
 #
 pkginclude_HEADERS += \
-       include/gc.h \
-       include/gc_typed.h \
-       include/gc_inline.h \
-       include/gc_mark.h \
-       include/gc_cpp.h \
-       include/weakpointer.h \
-       include/new_gc_alloc.h \
-       include/gc_allocator.h \
-       include/gc_backptr.h \
-       include/gc_gcj.h \
-       include/leak_detector.h \
-       include/gc_amiga_redirects.h \
-       include/gc_pthread_redirects.h \
-       include/gc_config_macros.h \
-       include/gc_tiny_fl.h \
-       include/gc_version.h
+        include/gc.h \
+        include/gc_typed.h \
+        include/gc_inline.h \
+        include/gc_mark.h \
+        include/gc_cpp.h \
+        include/weakpointer.h \
+        include/new_gc_alloc.h \
+        include/gc_allocator.h \
+        include/gc_backptr.h \
+        include/gc_gcj.h \
+        include/leak_detector.h \
+        include/gc_pthread_redirects.h \
+        include/gc_config_macros.h \
+        include/gc_tiny_fl.h \
+        include/gc_version.h
 
 # headers which are not installed
 #
 dist_noinst_HEADERS += \
-       include/private/gc_hdrs.h \
-       include/private/gc_priv.h \
-       include/private/gcconfig.h \
-       include/private/gc_pmark.h \
-       include/private/gc_locks.h \
-       include/private/dbg_mlc.h \
-       include/private/specific.h \
-       include/private/cord_pos.h \
-       include/private/pthread_support.h \
-       include/private/pthread_stop_world.h \
-       include/private/darwin_semaphore.h \
-       include/private/darwin_stop_world.h \
-       include/private/thread_local_alloc.h \
-       include/cord.h \
-       include/ec.h \
-       include/javaxfc.h 
+        include/private/gc_hdrs.h \
+        include/private/gc_priv.h \
+        include/private/gcconfig.h \
+        include/private/gc_pmark.h \
+        include/private/gc_locks.h \
+        include/private/dbg_mlc.h \
+        include/private/specific.h \
+        include/private/cord_pos.h \
+        include/private/pthread_support.h \
+        include/private/pthread_stop_world.h \
+        include/private/darwin_semaphore.h \
+        include/private/darwin_stop_world.h \
+        include/private/thread_local_alloc.h \
+        include/cord.h \
+        include/ec.h \
+        include/javaxfc.h 
 
 # unprefixed header
 include_HEADERS += \

diff --git a/windows-untested/vc60/gc.dsp b/windows-untested/vc60/gc.dsp
index 0d6e8a54c80b4ffff6d0068e8a3bd30e96360655..e207fc546925fb923569ddbb9457125378fdf45a 100644 (file)
--- a/windows-untested/vc60/gc.dsp
+++ b/windows-untested/vc60/gc.dsp
@@ -221,10 +221,6 @@ SOURCE=..\..\include\gc_allocator.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\gc_amiga_redirects.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\gc_backptr.h
 # End Source File
 # Begin Source File

diff --git a/windows-untested/vc60/libgc.dsp b/windows-untested/vc60/libgc.dsp
index 16e64ca1916e7f7640db93acc27c1cccbb24f6ed..89b877322abf47bd11f8a8173801d1a087337759 100644 (file)
--- a/windows-untested/vc60/libgc.dsp
+++ b/windows-untested/vc60/libgc.dsp
@@ -210,10 +210,6 @@ SOURCE=..\..\include\gc_allocator.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\gc_amiga_redirects.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\gc_backptr.h
 # End Source File
 # Begin Source File

diff --git a/windows-untested/vc70/gc.vcproj b/windows-untested/vc70/gc.vcproj
index 39f56e4ea9c7b198e6b3cf59635345e00cd37a2f..3e7292672cd74fbbc1f2d23bac486d2df57fbb77 100644 (file)
--- a/windows-untested/vc70/gc.vcproj
+++ b/windows-untested/vc70/gc.vcproj
@@ -246,9 +246,6 @@
             <File
                 RelativePath="..\..\include\gc_allocator.h">
             </File>
-            <File
-                RelativePath="..\..\include\gc_amiga_redirects.h">
-            </File>
             <File
                 RelativePath="..\..\include\gc_backptr.h">
             </File>

diff --git a/windows-untested/vc70/libgc.vcproj b/windows-untested/vc70/libgc.vcproj
index 9728b68a8e0f3c3cb138f9fdee7ef7836e36eb1f..2379aa22694d1e35446f07b1aac1005190c70dc3 100644 (file)
--- a/windows-untested/vc70/libgc.vcproj
+++ b/windows-untested/vc70/libgc.vcproj
@@ -209,9 +209,6 @@
             <File
                 RelativePath="..\..\include\gc_allocator.h">
             </File>
-            <File
-                RelativePath="..\..\include\gc_amiga_redirects.h">
-            </File>
             <File
                 RelativePath="..\..\include\gc_backptr.h">
             </File>

diff --git a/windows-untested/vc71/gc.vcproj b/windows-untested/vc71/gc.vcproj
index 924a76e4668a442d3fe4d7d142a19882b0450d6a..804d5bbf6554d5cc734ab959442212b8c3b4dccf 100644 (file)
--- a/windows-untested/vc71/gc.vcproj
+++ b/windows-untested/vc71/gc.vcproj
@@ -728,9 +728,6 @@
             <File
                 RelativePath="..\..\include\gc_allocator.h">
             </File>
-            <File
-                RelativePath="..\..\include\gc_amiga_redirects.h">
-            </File>
             <File
                 RelativePath="..\..\include\gc_backptr.h">
             </File>

diff --git a/windows-untested/vc71/libgc.vcproj b/windows-untested/vc71/libgc.vcproj
index 0e2c9b54215289ca9c4f83d9c3ccdeb55a66b76b..3af146940ced4fd4660ce140c569507a2e358db5 100644 (file)
--- a/windows-untested/vc71/libgc.vcproj
+++ b/windows-untested/vc71/libgc.vcproj
@@ -689,9 +689,6 @@
             <File
                 RelativePath="..\..\include\gc_allocator.h">
             </File>
-            <File
-                RelativePath="..\..\include\gc_amiga_redirects.h">
-            </File>
             <File
                 RelativePath="..\..\include\gc_backptr.h">
             </File>