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 d007456affad4e4e640c6de1d7747c58c9104d0c..a33c21e276321a3c997a75a86849b2baa4751d9f 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 8bc483f7489ea1cea52732a0b482d340cdc1e87d..2231963fb0cbd58f3b8e179664f63e0155ce0738 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 864c50c73116100ecd296ec4a2c36847e9cbec13..b23ea7f2e60e7758962cf71dfc01910b46fb8a7e 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 4231fd7ff5cf2d99b5d0afe7de565b5ed6f60290..b00a482cc32c82b7e1abb29d18c66277fa6d9f24 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 229a0c3e0ef44225f2217e9717981437353a70df..86792b04974f5473a392454afaed905ee7b65647 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 8351d6b1761ba373c88bfae83b24acd0f82b617f..def4a91799d00fbad891b868ab0f5c6248b13f32 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 49c1c80c002bd94e9ef0eeb7c039ef0d81f31285..6458bda62f2cc03926654867b074f7a7b4369950 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 da11f342bbd3834d52ce9f85c32468c968728b07..145e73f3b4b1f8f1b58f9cd42c255f974861b675 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 3a57bc07de278a6a894b0f1738e7c66e8caa3c20..7bba6fb84d54855d920d80a11b4c1f91dd05115f 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 63e642f9bd5312cfda590c1ffe743191db86670d..70063ebd46dc27497b3d76a9d0a4038cf14e0792 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 cbdc5e3cdb85dcb43f68af77fa02110e44409544..9352f339284a451e1d3df30f4a9302c16e917165 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 be294e34d62cbb8f096e4500bd2ab829675c7225..ad22f23b9f6b97d96186a8d1c7571b1de54819c0 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 f3340dbd914be2400e7008348b3621affe09af1e..1d47590cf0cedf84d48a3690bbb68f4d2f35663f 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 0710fc2cc196731f6b599aa9bd916e7eeae9011d..8b7f82d613e33e80ce5a77822e49db93d576d373 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 4307b48cc0dc054ec1833bf51f92131b7ae50199..92b793fc88cae42656e64453e565222c4cbec2aa 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