GNOME.org
 

[libgxps/wip/nacho/meson: 6/6] Remove HAVE_CONFIG_H define

commit fda8393b05d04ca68128063cd19f0324e8e99c4d
Author: Ignacio Casal Quinteiro <qignacio amazon com>
Date:   Tue Jun 13 09:07:45 2017 +0200

    Remove HAVE_CONFIG_H define
    
    This is not needed anymore since we have it always defined.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=783642

 libgxps/gxps-archive.c            |    2 --
 libgxps/gxps-brush.c              |    2 --
 libgxps/gxps-color.c              |    2 --
 libgxps/gxps-core-properties.c    |    2 --
 libgxps/gxps-document-structure.c |    2 --
 libgxps/gxps-document.c           |    2 --
 libgxps/gxps-error.c              |    2 --
 libgxps/gxps-file.c               |    2 --
 libgxps/gxps-fonts.c              |    2 --
 libgxps/gxps-glyphs.c             |    2 --
 libgxps/gxps-images.c             |    2 --
 libgxps/gxps-links.c              |    2 --
 libgxps/gxps-matrix.c             |    2 --
 libgxps/gxps-page.c               |    2 --
 libgxps/gxps-parse-utils.c        |    2 --
 libgxps/gxps-path.c               |    2 --
 meson.build                       |    2 --
 tools/gxps-converter-main.c       |    2 --
 tools/gxps-converter.c            |    2 --
 tools/gxps-image-converter.c      |    2 --
 tools/gxps-image-writer.c         |    2 --
 tools/gxps-jpeg-converter.c       |    2 --
 tools/gxps-jpeg-writer.c          |    2 --
 tools/gxps-pdf-converter.c        |    2 --
 tools/gxps-png-converter.c        |    2 --
 tools/gxps-png-writer.c           |    2 --
 tools/gxps-print-converter.c      |    2 --
 tools/gxps-ps-converter.c         |    2 --
 tools/gxps-svg-converter.c        |    2 --
 29 files changed, 0 insertions(+), 58 deletions(-)
---
diff --git a/libgxps/gxps-archive.c b/libgxps/gxps-archive.c
index 398320a..acf8d7d 100644
--- a/libgxps/gxps-archive.c
+++ b/libgxps/gxps-archive.c
@@ -18,9 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <string.h>
 #include <archive_entry.h>
diff --git a/libgxps/gxps-brush.c b/libgxps/gxps-brush.c
index 5dd621f..2fc578b 100644
--- a/libgxps/gxps-brush.c
+++ b/libgxps/gxps-brush.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <math.h>
 #include <string.h>
diff --git a/libgxps/gxps-color.c b/libgxps/gxps-color.c
index cb6889b..20a62a0 100644
--- a/libgxps/gxps-color.c
+++ b/libgxps/gxps-color.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <glib.h>
 #ifdef HAVE_LIBLCMS2
diff --git a/libgxps/gxps-core-properties.c b/libgxps/gxps-core-properties.c
index 23329d6..7945dda 100644
--- a/libgxps/gxps-core-properties.c
+++ b/libgxps/gxps-core-properties.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "gxps-core-properties.h"
 #include "gxps-private.h"
diff --git a/libgxps/gxps-document-structure.c b/libgxps/gxps-document-structure.c
index a2512bb..c298afd 100644
--- a/libgxps/gxps-document-structure.c
+++ b/libgxps/gxps-document-structure.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <string.h>
 
diff --git a/libgxps/gxps-document.c b/libgxps/gxps-document.c
index 9aae6f0..06e35c3 100644
--- a/libgxps/gxps-document.c
+++ b/libgxps/gxps-document.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/libgxps/gxps-error.c b/libgxps/gxps-error.c
index 8469e9c..1b58a66 100644
--- a/libgxps/gxps-error.c
+++ b/libgxps/gxps-error.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "gxps-error.h"
 
diff --git a/libgxps/gxps-file.c b/libgxps/gxps-file.c
index 4754690..ba02c3f 100644
--- a/libgxps/gxps-file.c
+++ b/libgxps/gxps-file.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <string.h>
 
diff --git a/libgxps/gxps-fonts.c b/libgxps/gxps-fonts.c
index 5b9088a..882157d 100644
--- a/libgxps/gxps-fonts.c
+++ b/libgxps/gxps-fonts.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <glib.h>
 #include <ft2build.h>
diff --git a/libgxps/gxps-glyphs.c b/libgxps/gxps-glyphs.c
index 87e234e..26fd5d8 100644
--- a/libgxps/gxps-glyphs.c
+++ b/libgxps/gxps-glyphs.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <string.h>
 
diff --git a/libgxps/gxps-images.c b/libgxps/gxps-images.c
index 78b443d..98c7052 100644
--- a/libgxps/gxps-images.c
+++ b/libgxps/gxps-images.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libgxps/gxps-links.c b/libgxps/gxps-links.c
index 6b5615f..f234031 100644
--- a/libgxps/gxps-links.c
+++ b/libgxps/gxps-links.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <string.h>
 
diff --git a/libgxps/gxps-matrix.c b/libgxps/gxps-matrix.c
index 723ab68..9eb1fdc 100644
--- a/libgxps/gxps-matrix.c
+++ b/libgxps/gxps-matrix.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <string.h>
 
diff --git a/libgxps/gxps-page.c b/libgxps/gxps-page.c
index 40145b8..3333505 100644
--- a/libgxps/gxps-page.c
+++ b/libgxps/gxps-page.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/libgxps/gxps-parse-utils.c b/libgxps/gxps-parse-utils.c
index 2c8a58d..536f259 100644
--- a/libgxps/gxps-parse-utils.c
+++ b/libgxps/gxps-parse-utils.c
@@ -16,9 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/libgxps/gxps-path.c b/libgxps/gxps-path.c
index ad1cfbb..54a614a 100644
--- a/libgxps/gxps-path.c
+++ b/libgxps/gxps-path.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <string.h>
 
diff --git a/meson.build b/meson.build
index 44d33e8..4531ace 100644
--- a/meson.build
+++ b/meson.build
@@ -31,8 +31,6 @@ gxps_mandir = join_paths(get_option('prefix'), get_option('mandir'))
 cc = meson.get_compiler('c')
 host_system = host_machine.system()
 
-add_project_arguments('-DHAVE_CONFIG_H', language: 'c')
-
 # Compiler flags
 if cc.get_id() == 'msvc'
   # Make MSVC more pedantic, this is a recommended pragma list
diff --git a/tools/gxps-converter-main.c b/tools/gxps-converter-main.c
index f326b0c..2cf9d3e 100644
--- a/tools/gxps-converter-main.c
+++ b/tools/gxps-converter-main.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <glib.h>
 #include <locale.h>
diff --git a/tools/gxps-converter.c b/tools/gxps-converter.c
index 79553ab..618bc14 100644
--- a/tools/gxps-converter.c
+++ b/tools/gxps-converter.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "gxps-converter.h"
 #include <gio/gio.h>
diff --git a/tools/gxps-image-converter.c b/tools/gxps-image-converter.c
index 1b273c6..674f9ea 100644
--- a/tools/gxps-image-converter.c
+++ b/tools/gxps-image-converter.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "gxps-image-converter.h"
 #include <stdint.h>
diff --git a/tools/gxps-image-writer.c b/tools/gxps-image-writer.c
index 628f4fd..16ec3a3 100644
--- a/tools/gxps-image-writer.c
+++ b/tools/gxps-image-writer.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "gxps-image-writer.h"
 
diff --git a/tools/gxps-jpeg-converter.c b/tools/gxps-jpeg-converter.c
index 30a91b4..0f29e83 100644
--- a/tools/gxps-jpeg-converter.c
+++ b/tools/gxps-jpeg-converter.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "gxps-jpeg-converter.h"
 #include "gxps-jpeg-writer.h"
diff --git a/tools/gxps-jpeg-writer.c b/tools/gxps-jpeg-writer.c
index e70a71e..3f59c7e 100644
--- a/tools/gxps-jpeg-writer.c
+++ b/tools/gxps-jpeg-writer.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "gxps-jpeg-writer.h"
 #include <jpeglib.h>
diff --git a/tools/gxps-pdf-converter.c b/tools/gxps-pdf-converter.c
index cae4798..fb5798c 100644
--- a/tools/gxps-pdf-converter.c
+++ b/tools/gxps-pdf-converter.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "gxps-pdf-converter.h"
 #include <libgxps/gxps.h>
diff --git a/tools/gxps-png-converter.c b/tools/gxps-png-converter.c
index 91642c5..58d0e7f 100644
--- a/tools/gxps-png-converter.c
+++ b/tools/gxps-png-converter.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "gxps-png-converter.h"
 #include "gxps-png-writer.h"
diff --git a/tools/gxps-png-writer.c b/tools/gxps-png-writer.c
index 5ae679a..263b8ae 100644
--- a/tools/gxps-png-writer.c
+++ b/tools/gxps-png-writer.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "gxps-png-writer.h"
 #include <png.h>
diff --git a/tools/gxps-print-converter.c b/tools/gxps-print-converter.c
index e99993e..140efde 100644
--- a/tools/gxps-print-converter.c
+++ b/tools/gxps-print-converter.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "gxps-print-converter.h"
 #include <string.h>
diff --git a/tools/gxps-ps-converter.c b/tools/gxps-ps-converter.c
index a052960..698a8c6 100644
--- a/tools/gxps-ps-converter.c
+++ b/tools/gxps-ps-converter.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "gxps-ps-converter.h"
 #include <libgxps/gxps.h>
diff --git a/tools/gxps-svg-converter.c b/tools/gxps-svg-converter.c
index b481cd1..291f7aa 100644
--- a/tools/gxps-svg-converter.c
+++ b/tools/gxps-svg-converter.c
@@ -17,9 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "gxps-svg-converter.h"
 #include <libgxps/gxps.h>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]