diff options
| author | Ivan Maidanski <ivmai@mail.ru> | 2022-09-14 07:42:05 +0300 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2022-09-14 07:42:05 +0300 |
| commit | 69664ee76191c7b6a3745985b188652a3740aa2a (patch) | |
| tree | 720d311544befd2b6acb42de2f6d972f6b5e0e20 | |
| parent | 94091dc617b7626a1ccc060fbff153664618b181 (diff) | |
| download | bdwgc-69664ee76191c7b6a3745985b188652a3740aa2a.tar.gz | |
Include gc/gc[_cpp].h directly except for cord and tests
(refactoring)
* extra/msvc_dbg.c [!_M_ARM && !_M_ARM64 && !_M_X64 && _MSC_VER]:
Include "gc/gc.h" instead of "gc.h".
* gc_badalc.cc: Likewise.
* gc_cpp.cc: Likewise.
* include/private/gc_alloc_ptrs.h: Likewise.
* include/private/gc_atomic_ops.h [GC_BUILTIN_ATOMIC]: Likewise.
* include/private/gc_priv.h [!GC_H]: Likewise.
* gc_cpp.cc: Include "gc/gc_cpp.h" instead of "gc_cpp.h".
* include/private/gcconfig.h: Change include gc.h to include gc/gc.h
in comment.
| -rw-r--r-- | extra/msvc_dbg.c | 2 | ||||
| -rw-r--r-- | gc_badalc.cc | 2 | ||||
| -rw-r--r-- | gc_cpp.cc | 4 | ||||
| -rw-r--r-- | include/private/gc_alloc_ptrs.h | 2 | ||||
| -rw-r--r-- | include/private/gc_atomic_ops.h | 2 | ||||
| -rw-r--r-- | include/private/gc_priv.h | 2 | ||||
| -rw-r--r-- | include/private/gcconfig.h | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/extra/msvc_dbg.c b/extra/msvc_dbg.c index 84138aee..7385d203 100644 --- a/extra/msvc_dbg.c +++ b/extra/msvc_dbg.c @@ -30,7 +30,7 @@ #include <stdlib.h> #define GC_BUILD -#include "gc.h" +#include "gc/gc.h" #ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN 1 diff --git a/gc_badalc.cc b/gc_badalc.cc index e7090bf3..a3dea368 100644 --- a/gc_badalc.cc +++ b/gc_badalc.cc @@ -24,7 +24,7 @@ #endif #define GC_DONT_INCL_WINDOWS_H -#include "gc.h" +#include "gc/gc.h" #include <new> // for bad_alloc, precedes include of gc_cpp.h @@ -31,11 +31,11 @@ built-in "new" and "delete". #endif #define GC_DONT_INCL_WINDOWS_H -#include "gc.h" +#include "gc/gc.h" #include <new> // for bad_alloc, precedes include of gc_cpp.h -#include "gc_cpp.h" // for GC_OPERATOR_NEW_ARRAY +#include "gc/gc_cpp.h" // for GC_OPERATOR_NEW_ARRAY #if !(defined(_MSC_VER) || defined(__DMC__)) || defined(GC_NO_INLINE_STD_NEW) diff --git a/include/private/gc_alloc_ptrs.h b/include/private/gc_alloc_ptrs.h index b86b299b..6cc127c3 100644 --- a/include/private/gc_alloc_ptrs.h +++ b/include/private/gc_alloc_ptrs.h @@ -17,7 +17,7 @@ #ifndef GC_ALLOC_PTRS_H #define GC_ALLOC_PTRS_H -#include "gc.h" +#include "gc/gc.h" #ifdef __cplusplus extern "C" { diff --git a/include/private/gc_atomic_ops.h b/include/private/gc_atomic_ops.h index 158373d9..1f39095e 100644 --- a/include/private/gc_atomic_ops.h +++ b/include/private/gc_atomic_ops.h @@ -22,7 +22,7 @@ #ifdef GC_BUILTIN_ATOMIC -# include "gc.h" /* for GC_word */ +# include "gc/gc.h" /* for GC_word */ # ifdef __cplusplus extern "C" { diff --git a/include/private/gc_priv.h b/include/private/gc_priv.h index ecd849d7..5b49aead 100644 --- a/include/private/gc_priv.h +++ b/include/private/gc_priv.h @@ -53,7 +53,7 @@ # endif #ifndef GC_H -# include "gc.h" +# include "gc/gc.h" #endif #include <stdlib.h> diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h index a0859dea..b2437d1b 100644 --- a/include/private/gcconfig.h +++ b/include/private/gcconfig.h @@ -851,7 +851,7 @@ EXTERN_C_BEGIN * the original main program. The new main program would read something * like (provided real_main() is not inlined by the compiler): * - * #include "gc.h" + * #include "gc/gc.h" * * main(argc, argv, envp) * int argc; |