[Gc] Moving extra files to "extra" folder - part 1/2

Ivan Maidanski ivmai at mail.ru
Tue Nov 11 05:23:59 PST 2008


Hi!

Here is the patch accompanying the movement of 9 extra c files from root directory to newly-created "extra" subdirectory (of the root dir).

List of extra files:
- add_gc_prefix.c
- AmigaOS.c
- gcname.c
- if_mach.c
- if_not_there.c
- MacOS.c
- msvc_dbg.c
- setjmp_t.c
- threadlibs.c

Also, this patch completely removes "nursery" old stuff.

The patch itself consists of two parts - first part is obligatory.

Bye.


-------------- next part --------------
diff -ru bdwgc/EMX_MAKEFILE updated/bdwgc/EMX_MAKEFILE
--- bdwgc/EMX_MAKEFILE	2005-10-11 02:33:34.000000000 +0400
+++ updated/bdwgc/EMX_MAKEFILE	2008-11-11 15:01:54.000000000 +0300
@@ -130,8 +130,8 @@
 # If an optimized setjmp_test generates a segmentation fault,
 # odds are your compiler is broken.  Gctest may still work.
 # Try compiling setjmp_t.c unoptimized.
-setjmp_test.exe: $(srcdir)/setjmp_t.c $(srcdir)/gc.h
-	$(CC) $(CFLAGS) -o setjmp_test.exe $(srcdir)/setjmp_t.c
+setjmp_test.exe: $(srcdir)/extra/setjmp_t.c $(srcdir)/gc.h
+	$(CC) $(CFLAGS) -o setjmp_test.exe $(srcdir)/extra/setjmp_t.c
 
 test: setjmp_test.exe gctest.exe
 	./setjmp_test
diff -ru bdwgc/Makefile updated/bdwgc/Makefile
--- bdwgc/Makefile	2006-07-12 04:17:34.000000000 +0400
+++ updated/bdwgc/Makefile	2008-11-11 15:19:44.000000000 +0300
@@ -330,9 +330,9 @@
     sparc_mach_dep.S include/gc.h include/gc_typed.h include/gc_tiny_fl.h \
     include/private/gc_hdrs.h include/private/gc_priv.h \
     include/private/gcconfig.h include/private/gc_pmark.h \
-    include/gc_inline.h include/gc_mark.h \
-    threadlibs.c if_mach.c if_not_there.c gc_cpp.cc include/gc_cpp.h \
-    gcname.c include/weakpointer.h include/private/gc_locks.h \
+    include/gc_inline.h include/gc_mark.h extra/threadlibs.c \
+    extra/if_mach.c extra/if_not_there.c gc_cpp.cc include/gc_cpp.h \
+    extra/gcname.c include/weakpointer.h include/private/gc_locks.h \
     mips_ultrix_mach_dep.s \
     include/new_gc_alloc.h include/gc_allocator.h \
     include/javaxfc.h sparc_sunos4_mach_dep.s sparc_netbsd_mach_dep.s \
@@ -378,12 +378,12 @@
 		 configure_atomic_ops.sh
 #	Makefile and Makefile.direct are copies of each other.
 
-OTHER_FILES= Makefile setjmp_t.c callprocs \
-           MacProjects.sit.hqx MacOS.c \
+OTHER_FILES= Makefile extra/setjmp_t.c callprocs \
+           MacProjects.sit.hqx extra/MacOS.c \
            Mac_files/datastart.c Mac_files/dataend.c \
            Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \
-           add_gc_prefix.c gc_cpp.cpp \
-	   version.h AmigaOS.c mscvc_dbg.c include/private/msvc_dbg.h \
+           extra/add_gc_prefix.c gc_cpp.cpp \
+	   version.h extra/AmigaOS.c mscvc_dbg.c include/private/msvc_dbg.h \
 	   $(TESTS) $(GNU_BUILD_FILES) $(OTHER_MAKEFILES)
 
 CORD_INCLUDE_FILES= $(srcdir)/include/gc.h $(srcdir)/include/cord.h \
@@ -612,14 +612,14 @@
 	./if_mach M68K AMIGA $(CC) $(CFLAGS) -UGC_AMIGA_MAKINGLIB -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses
 	./if_not_there cord/de $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) `./threadlibs`
 
-if_mach: $(srcdir)/if_mach.c $(srcdir)/include/private/gcconfig.h
-	$(HOSTCC) $(HOSTCFLAGS) -o if_mach $(srcdir)/if_mach.c
+if_mach: $(srcdir)/extra/if_mach.c $(srcdir)/include/private/gcconfig.h
+	$(HOSTCC) $(HOSTCFLAGS) -o if_mach $(srcdir)/extra/if_mach.c
 
-threadlibs: $(srcdir)/threadlibs.c $(srcdir)/include/private/gcconfig.h Makefile
-	$(HOSTCC) $(HOSTCFLAGS) -o threadlibs $(srcdir)/threadlibs.c
+threadlibs: $(srcdir)/extra/threadlibs.c $(srcdir)/include/private/gcconfig.h Makefile
+	$(HOSTCC) $(HOSTCFLAGS) -o threadlibs $(srcdir)/extra/threadlibs.c
 
-if_not_there: $(srcdir)/if_not_there.c
-	$(HOSTCC) $(HOSTCFLAGS) -o if_not_there $(srcdir)/if_not_there.c
+if_not_there: $(srcdir)/extra/if_not_there.c
+	$(HOSTCC) $(HOSTCFLAGS) -o if_not_there $(srcdir)/extra/if_not_there.c
 
 clean: 
 	rm -f gc.a *.o *.exe tests/*.o gctest gctest_dyn_link test_cpp \
@@ -637,8 +637,8 @@
 # If an optimized setjmp_test generates a segmentation fault,
 # odds are your compiler is broken.  Gctest may still work.
 # Try compiling setjmp_t.c unoptimized.
-setjmp_test: $(srcdir)/setjmp_t.c $(srcdir)/include/gc.h $(UTILS) $(AO_INSTALL_DIR)
-	$(CC) $(CFLAGS) -o setjmp_test $(srcdir)/setjmp_t.c
+setjmp_test: $(srcdir)/extra/setjmp_t.c $(srcdir)/include/gc.h $(UTILS) $(AO_INSTALL_DIR)
+	$(CC) $(CFLAGS) -o setjmp_test $(srcdir)/extra/setjmp_t.c
 
 test:  KandRtest cord/cordtest
 	cord/cordtest
@@ -648,11 +648,11 @@
 	./setjmp_test
 	./gctest
 
-add_gc_prefix: $(srcdir)/add_gc_prefix.c $(srcdir)/version.h
-	$(CC) -o add_gc_prefix $(srcdir)/add_gc_prefix.c
+add_gc_prefix: $(srcdir)/extra/add_gc_prefix.c $(srcdir)/version.h
+	$(CC) -o add_gc_prefix $(srcdir)/extra/add_gc_prefix.c
 
-gcname: $(srcdir)/gcname.c $(srcdir)/version.h
-	$(CC) -o gcname $(srcdir)/gcname.c
+gcname: $(srcdir)/extra/gcname.c $(srcdir)/version.h
+	$(CC) -o gcname $(srcdir)/extra/gcname.c
 
 #We assume this is being done from source directory.
 dist gc.tar: $(SRCS) $(DOC_FILES) $(OTHER_FILES) add_gc_prefix gcname
diff -ru bdwgc/Makefile.am updated/bdwgc/Makefile.am
--- bdwgc/Makefile.am	2008-10-25 04:13:20.000000000 +0400
+++ updated/bdwgc/Makefile.am	2008-11-11 15:20:42.000000000 +0300
@@ -170,13 +170,13 @@
 
 # files used by makefiles other than Makefile.am
 #
-EXTRA_DIST += add_gc_prefix.c gcname.c if_mach.c if_not_there.c \
-    hpux_test_and_clear.s gc.mak MacOS.c \
-    MacProjects.sit.hqx mach_dep.c setjmp_t.c \
-    threadlibs.c AmigaOS.c \
+EXTRA_DIST += extra/add_gc_prefix.c extra/gcname.c extra/if_mach.c \
+    extra/if_not_there.c hpux_test_and_clear.s gc.mak extra/MacOS.c \
+    MacProjects.sit.hqx mach_dep.c extra/setjmp_t.c \
+    extra/threadlibs.c extra/AmigaOS.c \
     Mac_files/datastart.c Mac_files/dataend.c \
     Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \
-    include/private/msvc_dbg.h msvc_dbg.c
+    include/private/msvc_dbg.h extra/msvc_dbg.c
 
 # The libatomic_ops library.  This is not ideal, since we pick up junk from
 # there.  The hard-coded version number should also go.
diff -ru bdwgc/Makefile.direct updated/bdwgc/Makefile.direct
--- bdwgc/Makefile.direct	2008-11-05 04:11:08.000000000 +0300
+++ updated/bdwgc/Makefile.direct	2008-11-11 15:21:32.000000000 +0300
@@ -357,9 +357,9 @@
     sparc_mach_dep.S include/gc.h include/gc_typed.h include/gc_tiny_fl.h \
     include/gc_version.h include/private/gc_hdrs.h include/private/gc_priv.h \
     include/private/gcconfig.h include/private/gc_pmark.h \
-    include/gc_inline.h include/gc_mark.h \
-    threadlibs.c if_mach.c if_not_there.c gc_cpp.cc include/gc_cpp.h \
-    gcname.c include/weakpointer.h include/private/gc_locks.h \
+    include/gc_inline.h include/gc_mark.h extra/threadlibs.c \
+    extra/if_mach.c extra/if_not_there.c gc_cpp.cc include/gc_cpp.h \
+    extra/gcname.c include/weakpointer.h include/private/gc_locks.h \
     mips_ultrix_mach_dep.s \
     include/new_gc_alloc.h include/gc_allocator.h \
     include/javaxfc.h sparc_sunos4_mach_dep.s sparc_netbsd_mach_dep.s \
@@ -406,12 +406,12 @@
 		 NT_X64_STATIC_THREADS_MAKEFILE NT_X64_THREADS_MAKEFILE \
 		 build_atomic_ops.sh build_atomic_ops.sh.cygwin 
 
-OTHER_FILES= Makefile setjmp_t.c callprocs \
-           MacProjects.sit.hqx MacOS.c \
+OTHER_FILES= Makefile extra/setjmp_t.c callprocs \
+           MacProjects.sit.hqx extra/MacOS.c \
            Mac_files/datastart.c Mac_files/dataend.c \
            Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \
-           add_gc_prefix.c gc_cpp.cpp \
-	   AmigaOS.c mscvc_dbg.c include/private/msvc_dbg.h \
+           extra/add_gc_prefix.c gc_cpp.cpp \
+	   extra/AmigaOS.c mscvc_dbg.c include/private/msvc_dbg.h \
 	   $(TESTS) $(GNU_BUILD_FILES) $(OTHER_MAKEFILES)
 
 CORD_INCLUDE_FILES= $(srcdir)/include/gc.h $(srcdir)/include/cord.h \
@@ -639,14 +639,14 @@
 	./if_mach M68K AMIGA $(CC) $(CFLAGS) -UGC_AMIGA_MAKINGLIB -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses
 	./if_not_there cord/de $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) `./threadlibs`
 
-if_mach: $(srcdir)/if_mach.c $(srcdir)/include/private/gcconfig.h
-	$(HOSTCC) $(HOSTCFLAGS) -o if_mach $(srcdir)/if_mach.c
+if_mach: $(srcdir)/extra/if_mach.c $(srcdir)/include/private/gcconfig.h
+	$(HOSTCC) $(HOSTCFLAGS) -o if_mach $(srcdir)/extra/if_mach.c
 
-threadlibs: $(srcdir)/threadlibs.c $(srcdir)/include/private/gcconfig.h Makefile
-	$(HOSTCC) $(HOSTCFLAGS) -o threadlibs $(srcdir)/threadlibs.c
+threadlibs: $(srcdir)/extra/threadlibs.c $(srcdir)/include/private/gcconfig.h Makefile
+	$(HOSTCC) $(HOSTCFLAGS) -o threadlibs $(srcdir)/extra/threadlibs.c
 
-if_not_there: $(srcdir)/if_not_there.c
-	$(HOSTCC) $(HOSTCFLAGS) -o if_not_there $(srcdir)/if_not_there.c
+if_not_there: $(srcdir)/extra/if_not_there.c
+	$(HOSTCC) $(HOSTCFLAGS) -o if_not_there $(srcdir)/extra/if_not_there.c
 
 clean: 
 	rm -f gc.a *.o *.exe tests/*.o gctest gctest_dyn_link test_cpp \
@@ -664,8 +664,8 @@
 # If an optimized setjmp_test generates a segmentation fault,
 # odds are your compiler is broken.  Gctest may still work.
 # Try compiling setjmp_t.c unoptimized.
-setjmp_test: $(srcdir)/setjmp_t.c $(srcdir)/include/gc.h $(UTILS) $(AO_INSTALL_DIR)
-	$(CC) $(CFLAGS) -o setjmp_test $(srcdir)/setjmp_t.c
+setjmp_test: $(srcdir)/extra/setjmp_t.c $(srcdir)/include/gc.h $(UTILS) $(AO_INSTALL_DIR)
+	$(CC) $(CFLAGS) -o setjmp_test $(srcdir)/extra/setjmp_t.c
 
 test:  KandRtest cord/cordtest
 	cord/cordtest
@@ -675,11 +675,11 @@
 	./setjmp_test
 	./gctest
 
-add_gc_prefix: $(srcdir)/add_gc_prefix.c $(srcdir)/include/gc_version.h
-	$(CC) -o add_gc_prefix $(srcdir)/add_gc_prefix.c
+add_gc_prefix: $(srcdir)/extra/add_gc_prefix.c $(srcdir)/include/gc_version.h
+	$(CC) -o add_gc_prefix $(srcdir)/extra/add_gc_prefix.c
 
-gcname: $(srcdir)/gcname.c $(srcdir)/include/gc_version.h
-	$(CC) -o gcname $(srcdir)/gcname.c
+gcname: $(srcdir)/extra/gcname.c $(srcdir)/include/gc_version.h
+	$(CC) -o gcname $(srcdir)/extra/gcname.c
 
 #We assume this is being done from source directory.
 dist gc.tar: $(SRCS) $(DOC_FILES) $(OTHER_FILES) add_gc_prefix gcname
diff -ru bdwgc/Makefile.dj updated/bdwgc/Makefile.dj
--- bdwgc/Makefile.dj	2007-12-22 04:05:44.000000000 +0300
+++ updated/bdwgc/Makefile.dj	2008-11-11 15:38:40.000000000 +0300
@@ -168,8 +168,8 @@
     sparc_mach_dep.S include/gc.h include/gc_version.h include/gc_typed.h \
     include/private/gc_hdrs.h include/private/gc_priv.h \
     include/private/gcconfig.h include/private/gc_mark.h \
-    include/gc_inline.h gc.man \
-    threadlibs.c if_mach.c if_not_there.c gc_cpp.cc include/gc_cpp.h \
+    include/gc_inline.h gc.man extra/threadlibs.c \
+    extra/if_mach.c extra/if_not_there.c gc_cpp.cc include/gc_cpp.h \
     include/weakpointer.h include/private/gc_locks.h \
     gcc_support.c mips_ultrix_mach_dep.s include/gc_alloc.h \
     include/new_gc_alloc.h include/javaxfc.h sparc_sunos4_mach_dep.s \
@@ -180,17 +180,17 @@
     include/leak_detector.h $(CORD_SRCS)
 
 OTHER_FILES= Makefile PCR-Makefile OS2_MAKEFILE NT_MAKEFILE BCC_MAKEFILE \
-           README tests/test.c test_cpp.cc setjmp_t.c SMakefile.amiga \
+           README tests/test.c test_cpp.cc extra/setjmp_t.c SMakefile.amiga \
            SCoptions.amiga README.amiga README.win32 cord/README \
 	   README.rs6000 README.QUICK callprocs pc_excludes \
            barrett_diagram README.OS2 README.Mac MacProjects.sit.hqx \
-           MacOS.c EMX_MAKEFILE README.debugging \
+           extra/MacOS.c EMX_MAKEFILE README.debugging \
            Mac_files/datastart.c Mac_files/dataend.c \
            Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \
-           add_gc_prefix.c README.solaris2 README.sgi README.hp README.uts \
-	   win32_threads.c NT_THREADS_MAKEFILE gc.mak README.dj Makefile.dj \
-	   README.alpha README.linux README.MacOSX Makefile.DLLs \
-	   WCC_MAKEFILE nursery.c include/gc_nursery.h include/gc_copy_descr.h
+           extra/add_gc_prefix.c README.solaris2 README.sgi README.hp \
+           README.uts win32_threads.c NT_THREADS_MAKEFILE gc.mak README.dj \
+           Makefile.dj README.alpha README.linux README.MacOSX Makefile.DLLs \
+	   WCC_MAKEFILE
 
 CORD_INCLUDE_FILES= $(srcdir)/include/gc.h $(srcdir)/include/cord.h \
 	$(srcdir)/include/ec.h $(srcdir)/include/private/cord_pos.h
@@ -337,17 +337,17 @@
 	./if_mach ALPHA LINUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses
 	./if_not_there cord/de$(EXE_SUFFIX) $(CC) $(CFLAGS) -o cord/de$(EXE_SUFFIX) $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES)
 
-if_mach$(EXE_SUFFIX): $(srcdir)/if_mach.c $(srcdir)/include/private/gcconfig.h
+if_mach$(EXE_SUFFIX): $(srcdir)/extra/if_mach.c $(srcdir)/include/private/gcconfig.h
 	rm -f if_mach if_mach$(EXE_SUFFIX)
-	$(CC) $(CFLAGS) -o if_mach $(srcdir)/if_mach.c
+	$(CC) $(CFLAGS) -o if_mach $(srcdir)/extra/if_mach.c
 
-threadlibs$(EXE_SUFFIX): $(srcdir)/threadlibs.c $(srcdir)include/private/gcconfig.h Makefile
+threadlibs$(EXE_SUFFIX): $(srcdir)/extra/threadlibs.c $(srcdir)include/private/gcconfig.h Makefile
 	rm -f threadlibs threadlibs$(EXE_SUFFIX)
-	$(CC) $(CFLAGS) -o threadlibs $(srcdir)/threadlibs.c
+	$(CC) $(CFLAGS) -o threadlibs $(srcdir)/extra/threadlibs.c
 
-if_not_there$(EXE_SUFFIX): $(srcdir)/if_not_there.c
+if_not_there$(EXE_SUFFIX): $(srcdir)/extra/if_not_there.c
 	rm -f if_not_there if_not_there$(EXE_SUFFIX)
-	$(CC) $(CFLAGS) -o if_not_there $(srcdir)/if_not_there.c
+	$(CC) $(CFLAGS) -o if_not_there $(srcdir)/extra/if_not_there.c
 
 # Clean removes *.o several times,
 # because as the first one doesn't seem to get them all!
@@ -374,10 +374,10 @@
 # If an optimized setjmp_test generates a segmentation fault,
 # odds are your compiler is broken.  Gctest may still work.
 # Try compiling setjmp_t.c unoptimized.
-setjmp_test$(EXE_SUFFIX): $(srcdir)/setjmp_t.c $(srcdir)/include/gc.h \
+setjmp_test$(EXE_SUFFIX): $(srcdir)/extra/setjmp_t.c $(srcdir)/include/gc.h \
 		if_mach$(EXE_SUFFIX) if_not_there$(EXE_SUFFIX)
 	rm -f setjmp_test$(EXE_SUFFIX)
-	$(CC) $(CFLAGS) -o setjmp_test $(srcdir)/setjmp_t.c
+	$(CC) $(CFLAGS) -o setjmp_test $(srcdir)/extra/setjmp_t.c
 	rm -f setjmp_test
 
 test:  KandRtest cord/cordtest$(EXE_SUFFIX)
@@ -388,8 +388,8 @@
 	./setjmp_test$(EXE_SUFFIX)
 	./gctest$(EXE_SUFFIX)
 
-add_gc_prefix$(EXE_SUFFIX): add_gc_prefix.c
-	$(CC) -o add_gc_prefix$(EXE_SUFFIX) $(srcdir)/add_gc_prefix.c
+add_gc_prefix$(EXE_SUFFIX): extra/add_gc_prefix.c
+	$(CC) -o add_gc_prefix$(EXE_SUFFIX) $(srcdir)/extra/add_gc_prefix.c
 	rm -f add_gc_prefix
 
 gc.tar: $(SRCS) $(OTHER_FILES) add_gc_prefix
diff -ru bdwgc/Makefile.in updated/bdwgc/Makefile.in
--- bdwgc/Makefile.in	2008-10-25 04:13:20.000000000 +0400
+++ updated/bdwgc/Makefile.in	2008-11-11 15:23:02.000000000 +0300
@@ -468,12 +468,12 @@
 	SMakefile.amiga WCC_MAKEFILE build_atomic_ops.sh \
 	build_atomic_ops.sh.cygwin NT_STATIC_THREADS_MAKEFILE \
 	NT_X64_STATIC_THREADS_MAKEFILE NT_X64_THREADS_MAKEFILE \
-	add_gc_prefix.c gcname.c if_mach.c if_not_there.c \
-	hpux_test_and_clear.s gc.mak MacOS.c MacProjects.sit.hqx \
-	mach_dep.c setjmp_t.c threadlibs.c AmigaOS.c \
-	Mac_files/datastart.c Mac_files/dataend.c \
+	extra/add_gc_prefix.c extra/gcname.c extra/if_mach.c \
+	extra/if_not_there.c hpux_test_and_clear.s gc.mak extra/MacOS.c \
+	MacProjects.sit.hqx mach_dep.c extra/setjmp_t.c extra/threadlibs.c \
+	extra/AmigaOS.c Mac_files/datastart.c Mac_files/dataend.c \
 	Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \
-	include/private/msvc_dbg.h msvc_dbg.c libatomic_ops-1.2 \
+	include/private/msvc_dbg.h extra/msvc_dbg.c libatomic_ops-1.2 \
 	libtool.m4 cord/cordbscs.c cord/cordtest.c cord/de.c \
 	cord/cordprnt.c cord/cordxtra.c cord/de_cmds.h cord/de_win.h \
 	cord/de_win.c cord/de_win.RC cord/de_win.ICO
diff -ru bdwgc/NT_THREADS_MAKEFILE updated/bdwgc/NT_THREADS_MAKEFILE
--- bdwgc/NT_THREADS_MAKEFILE	2006-07-30 22:03:18.000000000 +0400
+++ updated/bdwgc/NT_THREADS_MAKEFILE	2008-11-11 15:12:02.000000000 +0300
@@ -1880,7 +1880,7 @@
 ################################################################################
 # Begin Source File
 
-SOURCE=.\msvc_dbg.c
+SOURCE=.\extra\msvc_dbg.c
 
 !IF  "$(CFG)" == "gc - Win32 Release"
 
diff -ru bdwgc/doc/simple_example.html updated/bdwgc/doc/simple_example.html
--- bdwgc/doc/simple_example.html	2008-08-28 02:14:52.000000000 +0400
+++ updated/bdwgc/doc/simple_example.html	2008-11-11 15:08:12.000000000 +0300
@@ -210,7 +210,7 @@
 and compile with any thread-safety options required by your compiler.
 On some platforms, you may also need to link with <TT>-ldl</tt>
 or <TT>-lrt</tt>.
-Looking at threadlibs.c in the GC build directory
+Looking at threadlibs.c in the GC "extra" directory
 should give you the appropriate
 list if a plain <TT>-lpthread</tt> doesn't work.
 </font>
diff -ru bdwgc/gc.mak updated/bdwgc/gc.mak
--- bdwgc/gc.mak	2006-07-30 22:03:18.000000000 +0400
+++ updated/bdwgc/gc.mak	2008-11-11 15:13:58.000000000 +0300
@@ -1880,7 +1880,7 @@
 ################################################################################
 # Begin Source File
 
-SOURCE=.\msvc_dbg.c
+SOURCE=.\extra\msvc_dbg.c
 
 !IF  "$(CFG)" == "gc - Win32 Release"
 
diff -ru bdwgc/include/private/gc_priv.h updated/bdwgc/include/private/gc_priv.h
--- bdwgc/include/private/gc_priv.h	2008-11-11 03:24:52.000000000 +0300
+++ updated/bdwgc/include/private/gc_priv.h	2008-11-11 15:38:06.000000000 +0300
@@ -1433,12 +1433,7 @@
   ptr_t GC_save_regs_in_stack(void);
 # endif
 			/* Push register contents onto mark stack.	*/
-  			/* If NURSERY is defined, the default push	*/
-  			/* action can be overridden with GC_push_proc	*/
 
-# ifdef NURSERY
-    extern void (*GC_push_proc)(ptr_t);
-# endif
 # if defined(MSWIN32) || defined(MSWINCE)
   void __cdecl GC_push_one(word p);
 # else
diff -ru bdwgc/os_dep.c updated/bdwgc/os_dep.c
--- bdwgc/os_dep.c	2008-11-08 03:29:56.000000000 +0300
+++ updated/bdwgc/os_dep.c	2008-11-11 14:41:30.000000000 +0300
@@ -76,7 +76,7 @@
 
 #ifdef AMIGA
 # define GC_AMIGA_DEF
-# include "AmigaOS.c"
+# include "extra/AmigaOS.c"
 # undef GC_AMIGA_DEF
 #endif
 
@@ -705,7 +705,7 @@
 
 # ifdef AMIGA
 #   define GC_AMIGA_SB
-#   include "AmigaOS.c"
+#   include "extra/AmigaOS.c"
 #   undef GC_AMIGA_SB
 # endif /* AMIGA */
 
@@ -1572,7 +1572,7 @@
 #ifdef AMIGA
 
 #  define GC_AMIGA_DS
-#  include "AmigaOS.c"
+#  include "extra/AmigaOS.c"
 #  undef GC_AMIGA_DS
 
 #else /* !OS2 && !Windows && !AMIGA */
@@ -1884,7 +1884,7 @@
 
 #ifdef AMIGA
 # define GC_AMIGA_AM
-# include "AmigaOS.c"
+# include "extra/AmigaOS.c"
 # undef GC_AMIGA_AM
 #endif
 


More information about the Gc mailing list