GNOME.org
 

[json-glib] Remove conditional inclusion of config.h

commit d3fcd43a73061a64dc5f8b7551c138849a32b719
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Tue Mar 18 18:10:14 2014 +0000

    Remove conditional inclusion of config.h
    
    All the platforms and build system we support have a config.h header.

 json-glib/json-array.c        |    2 --
 json-glib/json-builder.c      |    2 --
 json-glib/json-debug.c        |    2 --
 json-glib/json-gboxed.c       |    2 --
 json-glib/json-generator.c    |    2 --
 json-glib/json-gobject.c      |    2 --
 json-glib/json-gvariant.c     |    2 --
 json-glib/json-node.c         |    2 --
 json-glib/json-object.c       |    3 ---
 json-glib/json-parser.c       |    2 --
 json-glib/json-path.c         |    2 --
 json-glib/json-reader.c       |    4 ----
 json-glib/json-scanner.c      |    2 --
 json-glib/json-serializable.c |    2 --
 json-glib/json-value.c        |    2 --
 json-glib/tests/generator.c   |    2 --
 json-glib/tests/invalid.c     |    2 --
 json-glib/tests/parser.c      |    2 --
 18 files changed, 0 insertions(+), 39 deletions(-)
---
diff --git a/json-glib/json-array.c b/json-glib/json-array.c
index 1639426..c747989 100644
--- a/json-glib/json-array.c
+++ b/json-glib/json-array.c
@@ -21,9 +21,7 @@
  *   Emmanuele Bassi  <ebassi linux intel com>
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "json-types-private.h"
 
diff --git a/json-glib/json-builder.c b/json-glib/json-builder.c
index b75b3c2..f3d6599 100644
--- a/json-glib/json-builder.c
+++ b/json-glib/json-builder.c
@@ -37,9 +37,7 @@
  * most of functions, making it easy to chain function calls.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/json-glib/json-debug.c b/json-glib/json-debug.c
index 2838542..5e72e43 100644
--- a/json-glib/json-debug.c
+++ b/json-glib/json-debug.c
@@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "json-debug.h"
 
diff --git a/json-glib/json-gboxed.c b/json-glib/json-gboxed.c
index 0caac04..ef53af1 100644
--- a/json-glib/json-gboxed.c
+++ b/json-glib/json-gboxed.c
@@ -66,9 +66,7 @@
  * and to which specific #JsonNodeType.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/json-glib/json-generator.c b/json-glib/json-generator.c
index 276f3a6..9868973 100644
--- a/json-glib/json-generator.c
+++ b/json-glib/json-generator.c
@@ -29,9 +29,7 @@
  * put it into a buffer or a file.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/json-glib/json-gobject.c b/json-glib/json-gobject.c
index 0ab79c1..3beb0e6 100644
--- a/json-glib/json-gobject.c
+++ b/json-glib/json-gobject.c
@@ -32,9 +32,7 @@
  * and its virtual functions.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/json-glib/json-gvariant.c b/json-glib/json-gvariant.c
index 99e6d64..9c4ce1a 100644
--- a/json-glib/json-gvariant.c
+++ b/json-glib/json-gvariant.c
@@ -17,9 +17,7 @@
  *   Eduardo Lima Mitev  <elima igalia com>
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/json-glib/json-node.c b/json-glib/json-node.c
index fd89716..13968bc 100644
--- a/json-glib/json-node.c
+++ b/json-glib/json-node.c
@@ -21,9 +21,7 @@
  *   Emmanuele Bassi  <ebassi linux intel com>
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <glib.h>
 
diff --git a/json-glib/json-object.c b/json-glib/json-object.c
index d134421..6d203b2 100644
--- a/json-glib/json-object.c
+++ b/json-glib/json-object.c
@@ -21,12 +21,9 @@
  *   Emmanuele Bassi  <ebassi linux intel com>
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <string.h>
-
 #include <glib.h>
 
 #include "json-types-private.h"
diff --git a/json-glib/json-parser.c b/json-glib/json-parser.c
index edc13f0..16aee60 100644
--- a/json-glib/json-parser.c
+++ b/json-glib/json-parser.c
@@ -30,9 +30,7 @@
  * inside a file or inside a static buffer.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <string.h>
 
diff --git a/json-glib/json-path.c b/json-glib/json-path.c
index e212f87..3ccf98f 100644
--- a/json-glib/json-path.c
+++ b/json-glib/json-path.c
@@ -152,9 +152,7 @@
  * #JsonPath is available since JSON-GLib 0.14
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <string.h>
 
diff --git a/json-glib/json-reader.c b/json-glib/json-reader.c
index eea2866..67b67a5 100644
--- a/json-glib/json-reader.c
+++ b/json-glib/json-reader.c
@@ -61,18 +61,14 @@
  * #JsonReader is available since JSON-GLib 0.12.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <string.h>
 
 #include <glib/gi18n-lib.h>
 
 #include "json-reader.h"
-
 #include "json-types-private.h"
-
 #include "json-debug.h"
 
 #define json_reader_return_if_error_set(r)      G_STMT_START {  \
diff --git a/json-glib/json-scanner.c b/json-glib/json-scanner.c
index 5d7cb89..daf9ead 100644
--- a/json-glib/json-scanner.c
+++ b/json-glib/json-scanner.c
@@ -20,9 +20,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/json-glib/json-serializable.c b/json-glib/json-serializable.c
index 5567b47..08327a9 100644
--- a/json-glib/json-serializable.c
+++ b/json-glib/json-serializable.c
@@ -27,9 +27,7 @@
  * json_serialize_gobject() respectively.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/json-glib/json-value.c b/json-glib/json-value.c
index 7e9babd..43ea4dd 100644
--- a/json-glib/json-value.c
+++ b/json-glib/json-value.c
@@ -20,9 +20,7 @@
  *   Emmanuele Bassi  <ebassi linux intel com>
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <glib.h>
 
diff --git a/json-glib/tests/generator.c b/json-glib/tests/generator.c
index 136795d..a96153c 100644
--- a/json-glib/tests/generator.c
+++ b/json-glib/tests/generator.c
@@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/json-glib/tests/invalid.c b/json-glib/tests/invalid.c
index 5eff885..bac540f 100644
--- a/json-glib/tests/invalid.c
+++ b/json-glib/tests/invalid.c
@@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/json-glib/tests/parser.c b/json-glib/tests/parser.c
index c2ed658..1747697 100644
--- a/json-glib/tests/parser.c
+++ b/json-glib/tests/parser.c
@@ -1,6 +1,4 @@
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 #include <stdio.h>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]