74 lines
1.9 KiB
Diff
74 lines
1.9 KiB
Diff
|
From 9ca50cf2f81ff66b9f0cf9b5c418cafafce82715 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Eric Haszlakiewicz <erh+git@nimenees.com>
|
||
|
|
Date: Wed, 2 Jun 2021 23:53:23 +0000
|
||
|
|
Subject: [PATCH] Issue #709: adjust some include guards to be a bit more
|
||
|
|
json-c specific.
|
||
|
|
|
||
|
|
---
|
||
|
|
arraylist.h | 4 ++--
|
||
|
|
debug.h | 4 ++--
|
||
|
|
linkhash.h | 4 ++--
|
||
|
|
printbuf.h | 4 ++--
|
||
|
|
4 files changed, 8 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/arraylist.h b/arraylist.h
|
||
|
|
index 1b187560d2..f541706936 100644
|
||
|
|
--- 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 7463f863e3..4af0ba9236 100644
|
||
|
|
--- 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 414599de77..0ddfa54df1 100644
|
||
|
|
--- 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 a0da668e6e..9b338021e2 100644
|
||
|
|
--- 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)
|