Issue #709: adjust some include guards to be a bit more json-c specific.

diff --git a/arraylist.h b/arraylist.h
index 1b187560d2dd83b36dad26e75152f7f91700fffd..f541706936eb8ae944c33514f04283ad93a96d33 100644 (file)
--- a/arraylist.h
+++ b/arraylist.h
@@ -15,8 +15,8 @@
  *        Although this is exposed by the json_object_get_array() method,
  *        it is not recommended for direct use.
  */
-#ifndef _arraylist_h_
-#define _arraylist_h_
+#ifndef _json_c_arraylist_h_
+#define _json_c_arraylist_h_
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/debug.h b/debug.h
index 7463f863e3d7c8ecb45969a654def456cf41f2d9..4af0ba9236066b7a5e7324a05c48011ce4947fd6 100644 (file)
--- a/debug.h
+++ b/debug.h
@@ -14,8 +14,8 @@
  * @file
  * @brief Do not use, json-c internal, may be changed or removed at any time.
  */
-#ifndef _DEBUG_H_
-#define _DEBUG_H_
+#ifndef _JSON_C_DEBUG_H_
+#define _JSON_C_DEBUG_H_
 
 #include <stdlib.h>
 

diff --git a/linkhash.h b/linkhash.h
index 414599de770d6ff81fe1e98e12cfe60ddba233e3..0ddfa54df168021f227f07f98a6284473683d025 100644 (file)
--- a/linkhash.h
+++ b/linkhash.h
@@ -16,8 +16,8 @@
  *        this is exposed by the json_object_get_object() function and within the
  *        json_object_iter type, it is not recommended for direct use.
  */
-#ifndef _linkhash_h_
-#define _linkhash_h_
+#ifndef _json_c_linkhash_h_
+#define _json_c_linkhash_h_
 
 #include "json_object.h"
 

diff --git a/printbuf.h b/printbuf.h
index a0da668e6ebf442fc0c34ccf642e88615f00219a..9b338021e2e2732d4e5e0bd1c3e44d43fe38e27f 100644 (file)
--- a/printbuf.h
+++ b/printbuf.h
@@ -20,8 +20,8 @@
  *        json_object_set_serializer() direct use of this is not
  *        recommended.
  */
-#ifndef _printbuf_h_
-#define _printbuf_h_
+#ifndef _json_c_printbuf_h_
+#define _json_c_printbuf_h_
 
 #ifndef JSON_EXPORT
 #if defined(_MSC_VER) && defined(JSON_C_DLL)