Prevent double inclusion of javaxfc.h and private/specific.h

* include/javaxfc.h [GC_JAVAXFC_H]: Skip the whole header file.
* include/private/specific.h [GC_SPECIFIC_H]: Likewise.
* include/new_gc_alloc.h (GC_ALLOC_H): Rename to GC_NEW_ALLOC_H.
* include/private/dbg_mlc.h (_DBG_MLC_H): Rename to GC_DBG_MLC_H.

diff --git a/include/javaxfc.h b/include/javaxfc.h
index 27da68b3d80dbc7f1b64ccf0b6dbf5025d33cb20..40ff5b7fb02279328f98cbd6e28727f85b277d4c 100644 (file)
--- a/include/javaxfc.h
+++ b/include/javaxfc.h
@@ -15,6 +15,9 @@
  * modified is included with the above copyright notice.
  */
 
+#ifndef GC_JAVAXFC_H
+#define GC_JAVAXFC_H
+
 #ifndef GC_H
 # include "gc.h"
 #endif
@@ -58,3 +61,5 @@ GC_API void GC_CALL GC_finalize_all(void);
 #ifdef __cplusplus
   } /* extern "C" */
 #endif
+
+#endif /* GC_JAVAXFC_H */

diff --git a/include/new_gc_alloc.h b/include/new_gc_alloc.h
index a42733d778908d2df50a414813ba38e5e276d4ac..9b4d50ca83042004154485358734b5b08ddfb709 100644 (file)
--- a/include/new_gc_alloc.h
+++ b/include/new_gc_alloc.h
@@ -44,7 +44,8 @@
 // allocator is usually a very bad choice for a garbage collected environment.)
 //
 
-#ifndef GC_ALLOC_H
+#ifndef GC_NEW_ALLOC_H
+#define GC_NEW_ALLOC_H
 
 #include "gc.h"
 
@@ -67,8 +68,6 @@
 # define simple_alloc __simple_alloc
 #endif
 
-#define GC_ALLOC_H
-
 #include <stddef.h>
 #include <string.h>
 
@@ -512,4 +511,4 @@ __STL_END_NAMESPACE
 
 #endif /* __STL_USE_STD_ALLOCATORS */
 
-#endif /* GC_ALLOC_H */
+#endif /* GC_NEW_ALLOC_H */

diff --git a/include/private/dbg_mlc.h b/include/private/dbg_mlc.h
index 69cf95c3f56598dfcdff0b1d84a72fda968d97fd..b0c2599e1f4cf47eafbdb99de7267bdc1516c15d 100644 (file)
--- a/include/private/dbg_mlc.h
+++ b/include/private/dbg_mlc.h
@@ -22,8 +22,8 @@
  * included from header files that are frequently included by clients.
  */
 
-#ifndef _DBG_MLC_H
-#define _DBG_MLC_H
+#ifndef GC_DBG_MLC_H
+#define GC_DBG_MLC_H
 
 #include "gc_priv.h"
 #ifdef KEEP_BACK_PTRS
@@ -179,4 +179,4 @@ typedef struct {
 
 EXTERN_C_END
 
-#endif /* _DBG_MLC_H */
+#endif /* GC_DBG_MLC_H */

diff --git a/include/private/specific.h b/include/private/specific.h
index a1873ac85d36920582c37671f0d292ccc8188e8a..ec2ed9b4e762af45becd40b01b941eadd5ef2bf3 100644 (file)
--- a/include/private/specific.h
+++ b/include/private/specific.h
@@ -12,6 +12,9 @@
  * by adding a lock.
  */
 
+#ifndef GC_SPECIFIC_H
+#define GC_SPECIFIC_H
+
 #include <errno.h>
 
 EXTERN_C_BEGIN
@@ -113,3 +116,5 @@ GC_INLINE void * GC_getspecific(tsd * key)
 }
 
 EXTERN_C_END
+
+#endif /* GC_SPECIFIC_H */