2009-09-16 Ivan Maidanski <ivmai@mail.ru> (really Petter Urkedal)

	(gc_config_h_6a.patch with a minor correction)

	* include/private/gc_priv.h: Change include of config.h to
	private/config.h.
	* include/private/gc_pmark.h: Ditto.
	* gc_cpp.cc: Ditto.
	* tests/test.c: Ditto.
	* tests/test_cpp.cc: Include private/config.h (if HAVE_CONFIG_H);
	undefine GC_BUILD.

diff --git a/ChangeLog b/ChangeLog
index fcf30e8..b74cc71 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-09-16  Ivan Maidanski <ivmai@mail.ru> (really Petter Urkedal)
+       (gc_config_h_6a.patch with a minor correction)
+
+       * include/private/gc_priv.h: Change include of config.h to
+       private/config.h.
+       * include/private/gc_pmark.h: Ditto.
+       * gc_cpp.cc: Ditto.
+       * tests/test.c: Ditto.
+       * tests/test_cpp.cc: Include private/config.h (if HAVE_CONFIG_H);
+       undefine GC_BUILD.
+
 2009-09-16  Ivan Maidanski <ivmai@mail.ru>
        (ivmai128.diff - superseding diff62, diff66 partly)
 

diff --git a/gc_cpp.cc b/gc_cpp.cc
index eb53437..4d00130 100644 (file)
--- a/gc_cpp.cc
+++ b/gc_cpp.cc
@@ -24,7 +24,7 @@ Authors: John R. Ellis and Jesse Hull
 **************************************************************************/
 
 # ifdef HAVE_CONFIG_H
-#   include "config.h"
+#   include "private/config.h"
 # endif
 
 # ifndef GC_BUILD

diff --git a/include/private/gc_pmark.h b/include/private/gc_pmark.h
index 4b0ccd5..3dc46a8 100644 (file)
--- a/include/private/gc_pmark.h
+++ b/include/private/gc_pmark.h
@@ -26,7 +26,7 @@
 # define GC_PMARK_H
 
 # ifdef HAVE_CONFIG_H
-#   include "config.h"
+#   include "private/config.h"
 # endif
 
 # ifndef GC_BUILD

diff --git a/include/private/gc_priv.h b/include/private/gc_priv.h
index 16e29fa..b02ad1d 100644 (file)
--- a/include/private/gc_priv.h
+++ b/include/private/gc_priv.h
@@ -20,7 +20,7 @@
 # define GC_PRIVATE_H
 
 # ifdef HAVE_CONFIG_H
-#   include "config.h"
+#   include "private/config.h"
 # endif
 
 # ifndef GC_BUILD

diff --git a/tests/test.c b/tests/test.c
index b328522..01037dd 100644 (file)
--- a/tests/test.c
+++ b/tests/test.c
@@ -19,7 +19,7 @@
 /* checking for some of the tests.                             */
 
 # ifdef HAVE_CONFIG_H
-#   include "config.h"
+#   include "private/config.h"
 # endif
 
 # undef GC_BUILD

diff --git a/tests/test_cpp.cc b/tests/test_cpp.cc
index 98cb281..c5b0445 100644 (file)
--- a/tests/test_cpp.cc
+++ b/tests/test_cpp.cc
@@ -24,6 +24,10 @@ few minutes to complete.
 
 ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "private/config.h"
+#endif
+#undef GC_BUILD
 #include "gc_cpp.h"
 #include <stdio.h>
 #include <stdlib.h>