Include "config.h" instead of "private/config.h" on HAVE_CONFIG_H

(Change the behavior of HAVE_CONFIG_H macro to the standard one
which assumes that no folder is specified in #include "config.h".)

* configure.ac (AM_CONFIG_HEADER): Replace include/private/config.h to
include/config.h.
* cord/cordbscs.c: Include "config.h" (instead of "private/config.h")
if HAVE_CONFIG_H defined.
* cord/cordprnt.c: Likewise.
* cord/cordxtra.c: Likewise.
* gc_cpp.cc: Likewise.
* include/private/gc_pmark.h: Likewise.
* include/private/gc_priv.h: Likewise.
* real_malloc.c: Likewise.
* tests/disclaim_test.c: Likewise.
* tests/initsecondarythread.c: Likewise.
* tests/subthread_create.c: Likewise.
* tests/test.c: Likewise.
* tests/test_cpp.cc: Likewise.
* tests/thread_leak_test.c: Likewise.
* tests/threadkey_test.c: Likewise.

diff --git a/configure.ac b/configure.ac
index d007456..a33c21e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ AC_PREREQ(2.61)
 AC_REVISION($Revision: 1.69 $)
 GC_SET_VERSION
 AM_INIT_AUTOMAKE([foreign dist-bzip2 nostdinc])
-AM_CONFIG_HEADER([include/private/config.h])
+AM_CONFIG_HEADER([include/config.h])
 AM_MAINTAINER_MODE
 
 AC_SUBST(PACKAGE)

diff --git a/cord/cordbscs.c b/cord/cordbscs.c
index 8bc483f..2231963 100644 (file)
--- a/cord/cordbscs.c
+++ b/cord/cordbscs.c
@@ -12,7 +12,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "private/config.h"
+# include "config.h"
 #endif
 #ifndef CORD_BUILD
 # define CORD_BUILD

diff --git a/cord/cordprnt.c b/cord/cordprnt.c
index 864c50c..b23ea7f 100644 (file)
--- a/cord/cordprnt.c
+++ b/cord/cordprnt.c
@@ -22,7 +22,7 @@
 /* sprintf implementation whenever possible.                            */
 
 #ifdef HAVE_CONFIG_H
-# include "private/config.h"
+# include "config.h"
 #endif
 #ifndef CORD_BUILD
 # define CORD_BUILD

diff --git a/cord/cordxtra.c b/cord/cordxtra.c
index 4231fd7..b00a482 100644 (file)
--- a/cord/cordxtra.c
+++ b/cord/cordxtra.c
@@ -18,7 +18,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "private/config.h"
+# include "config.h"
 #endif
 #ifndef CORD_BUILD
 # define CORD_BUILD

diff --git a/gc_cpp.cc b/gc_cpp.cc
index 229a0c3..86792b0 100644 (file)
--- a/gc_cpp.cc
+++ b/gc_cpp.cc
@@ -20,7 +20,7 @@ built-in "new" and "delete".
 **************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "private/config.h"
+# include "config.h"
 #endif
 
 #ifndef GC_BUILD

diff --git a/include/private/gc_pmark.h b/include/private/gc_pmark.h
index 8351d6b..def4a91 100644 (file)
--- a/include/private/gc_pmark.h
+++ b/include/private/gc_pmark.h
@@ -23,7 +23,7 @@
 #define GC_PMARK_H
 
 #ifdef HAVE_CONFIG_H
-# include "private/config.h"
+# include "config.h"
 #endif
 
 #ifndef GC_BUILD

diff --git a/include/private/gc_priv.h b/include/private/gc_priv.h
index 49c1c80..6458bda 100644 (file)
--- a/include/private/gc_priv.h
+++ b/include/private/gc_priv.h
@@ -19,7 +19,7 @@
 #define GC_PRIVATE_H
 
 #ifdef HAVE_CONFIG_H
-# include "private/config.h"
+# include "config.h"
 #endif
 
 #ifndef GC_BUILD

diff --git a/real_malloc.c b/real_malloc.c
index da11f34..145e73f 100644 (file)
--- a/real_malloc.c
+++ b/real_malloc.c
@@ -13,7 +13,7 @@
  */
 
 # ifdef HAVE_CONFIG_H
-#   include "private/config.h"
+#   include "config.h"
 # endif
 
 # ifdef PCR

diff --git a/tests/disclaim_test.c b/tests/disclaim_test.c
index 3a57bc0..7bba6fb 100644 (file)
--- a/tests/disclaim_test.c
+++ b/tests/disclaim_test.c
@@ -22,7 +22,7 @@
 
 #ifdef HAVE_CONFIG_H
   /* For GC_[P]THREADS */
-# include "private/config.h"
+# include "config.h"
 #endif
 
 #include "gc_disclaim.h"

diff --git a/tests/initsecondarythread.c b/tests/initsecondarythread.c
index 63e642f..70063eb 100644 (file)
--- a/tests/initsecondarythread.c
+++ b/tests/initsecondarythread.c
@@ -16,7 +16,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "private/config.h"
+# include "config.h"
 #endif
 
 #ifndef GC_THREADS

diff --git a/tests/subthread_create.c b/tests/subthread_create.c
index cbdc5e3..9352f33 100644 (file)
--- a/tests/subthread_create.c
+++ b/tests/subthread_create.c
@@ -1,7 +1,7 @@
 
 #ifdef HAVE_CONFIG_H
   /* For PARALLEL_MARK */
-# include "private/config.h"
+# include "config.h"
 #endif
 
 #ifndef GC_THREADS

diff --git a/tests/test.c b/tests/test.c
index be294e3..ad22f23 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 "private/config.h"
+#   include "config.h"
 # endif
 
 # undef GC_BUILD

diff --git a/tests/test_cpp.cc b/tests/test_cpp.cc
index f3340db..1d47590 100644 (file)
--- a/tests/test_cpp.cc
+++ b/tests/test_cpp.cc
@@ -23,7 +23,7 @@ few minutes to complete.
 ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "private/config.h"
+# include "config.h"
 #endif
 
 #undef GC_BUILD

diff --git a/tests/thread_leak_test.c b/tests/thread_leak_test.c
index 0710fc2..8b7f82d 100644 (file)
--- a/tests/thread_leak_test.c
+++ b/tests/thread_leak_test.c
@@ -1,6 +1,6 @@
 
 #ifdef HAVE_CONFIG_H
-# include "private/config.h"
+# include "config.h"
 #endif
 
 #ifndef GC_THREADS

diff --git a/tests/threadkey_test.c b/tests/threadkey_test.c
index 4307b48..92b793f 100644 (file)
--- a/tests/threadkey_test.c
+++ b/tests/threadkey_test.c
@@ -1,6 +1,6 @@
 
 #ifdef HAVE_CONFIG_H
-# include "private/config.h"
+# include "config.h"
 #endif
 
 #ifndef GC_THREADS