Remove HAVE_CONFIG_H defs and uses

Since GLib files are only meant to be built as part of GLib, config.h always exists, so the checks are more or less pointless. https://bugzilla.gnome.org/show_bug.cgi?id=793399
2024-11-09 02:46:16 +01:00 · 2018-02-19 14:09:10 +02:00 · 2018-02-19 14:09:10 +02:00 · 03e86d000f
commit 03e86d000f
parent 9d24c8b223
49 changed files with 31 additions and 100 deletions
--- a/build/win32/vs8/glib.vcproj
+++ b/build/win32/vs8/glib.vcproj
@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;Glib\&quot;;G_ENABLE_DEBUG;G_DISABLE_DEPRECATED;PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN=\&quot;Glib\&quot;;G_ENABLE_DEBUG;G_DISABLE_DEPRECATED;PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@ -125,7 +125,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;Glib\&quot;;G_DISABLE_DEPRECATED;PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN=\&quot;Glib\&quot;;G_DISABLE_DEPRECATED;PCRE_STATIC;LINK_SIZE=2;MAX_NAME_SIZE=32;MAX_NAME_COUNT=10000;NEWLINE=-1;POSIX_MALLOC_THRESHOLD=10;MATCH_LIMIT=10000000;MATCH_LIMIT_RECURSION=10000000"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
--- a/build/win32/vs8/gmodule.vcproj
+++ b/build/win32/vs8/gmodule.vcproj
@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../../glib;../../.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;GModule\&quot;;G_DISABLE_DEPRECATED"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GModule\&quot;;G_DISABLE_DEPRECATED"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@ -123,7 +123,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="../../../glib;../../.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;GModule\&quot;;G_DISABLE_DEPRECATED"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GModule\&quot;;G_DISABLE_DEPRECATED"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
--- a/build/win32/vs8/gobject.vcproj
+++ b/build/win32/vs8/gobject.vcproj
@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../..,../../../glib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;Glib-GObject\&quot;;G_DISABLE_DEPRECATED"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;G_LOG_DOMAIN=\&quot;Glib-GObject\&quot;;G_DISABLE_DEPRECATED"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@ -121,7 +121,7 @@
 				Name="VCCLCompilerTool"
 				WholeProgramOptimization="false"
 				AdditionalIncludeDirectories="../../..,../../../glib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;Glib-GObject\&quot;;G_DISABLE_DEPRECATED"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GOBJECT_COMPILATION;G_LOG_DOMAIN=\&quot;Glib-GObject\&quot;;G_DISABLE_DEPRECATED"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
--- a/build/win32/vs8/gthread.vcproj
+++ b/build/win32/vs8/gthread.vcproj
@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../..,../../../glib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;GThread\&quot;;G_DISABLE_DEPRECATED"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GThread\&quot;;G_DISABLE_DEPRECATED"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@ -121,7 +121,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="../../..,../../../glib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;G_LOG_DOMAIN=\&quot;GThread\&quot;;G_DISABLE_DEPRECATED"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;G_LOG_DOMAIN=\&quot;GThread\&quot;;G_DISABLE_DEPRECATED"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
--- a/gio/inotify/meson.build
+++ b/gio/inotify/meson.build
@ -12,4 +12,4 @@ inotify_lib = static_library('inotify',
  include_directories : [configinc, glibinc, gmoduleinc],
  dependencies : [gioenumtypes_dep],
  pic : true,
-  c_args : [ '-DHAVE_CONFIG_H', '-DG_DISABLE_DEPRECATED' ] + gio_c_args)
+  c_args : [ '-DG_DISABLE_DEPRECATED' ] + gio_c_args)
--- a/gio/kqueue/meson.build
+++ b/gio/kqueue/meson.build
@ -15,4 +15,4 @@ kqueue_lib = static_library('kqueue',
  sources : kqueue_sources,
  include_directories : [configinc, glibinc, gmoduleinc],
  pic : true,
-  c_args : [ '-DHAVE_CONFIG_H', '-DG_DISABLE_DEPRECATED' ] + gio_c_args)
+  c_args : [ '-DG_DISABLE_DEPRECATED' ] + gio_c_args)
--- a/gio/meson.build
+++ b/gio/meson.build
@ -841,24 +841,22 @@ gio_tool_sources = [
  'gio-tool-tree.c',
 ]

-# FIXME: are all these HAVE_CONFIG_H needed/used here?
 executable('gio', gio_tool_sources,
  install : true,
-  c_args : ['-DHAVE_CONFIG_H=1'] + gio_c_args,
+  c_args : gio_c_args,
  # intl.lib is not compatible with SAFESEH
  link_args : noseh_link_args,
  dependencies : [libintl, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])

 executable('gresource', 'gresource-tool.c',
  install : true,
-  c_args : ['-DHAVE_CONFIG_H=1'],
  # intl.lib is not compatible with SAFESEH
  link_args : noseh_link_args,
  dependencies : [libelf, libintl, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])

 executable('gio-querymodules', 'gio-querymodules.c', 'giomodule-priv.c',
  install : true,
-  c_args : ['-DHAVE_CONFIG_H=1'] + gio_c_args,
+  c_args : gio_c_args,
  # intl.lib is not compatible with SAFESEH
  link_args : noseh_link_args,
  dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
@ -866,7 +864,6 @@ executable('gio-querymodules', 'gio-querymodules.c', 'giomodule-priv.c',
 glib_compile_schemas = executable('glib-compile-schemas',
  [gconstructor_as_data_h, 'gvdb/gvdb-builder.c', 'glib-compile-schemas.c'],
  install : true,
-  c_args : ['-DHAVE_CONFIG_H=1'],
  # intl.lib is not compatible with SAFESEH
  link_args : noseh_link_args,
  dependencies : [libintl, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
@ -874,14 +871,14 @@ glib_compile_schemas = executable('glib-compile-schemas',
 glib_compile_resources = executable('glib-compile-resources',
  [gconstructor_as_data_h, 'gvdb/gvdb-builder.c', 'glib-compile-resources.c'],
  install : true,
-  c_args : ['-DHAVE_CONFIG_H=1'] + gio_c_args,
+  c_args : gio_c_args,
  # intl.lib is not compatible with SAFESEH
  link_args : noseh_link_args,
  dependencies : [libintl, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])

 executable('gsettings', 'gsettings-tool.c',
  install : true,
-  c_args : ['-DHAVE_CONFIG_H=1'] + gio_c_args,
+  c_args : gio_c_args,
  # intl.lib is not compatible with SAFESEH
  link_args : noseh_link_args,
  dependencies : [libintl, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
@ -893,7 +890,7 @@ install_data(['gschema.loc', 'gschema.its'],

 executable('gdbus', 'gdbus-tool.c',
  install : true,
-  c_args : ['-DHAVE_CONFIG_H=1'] + gio_c_args,
+  c_args : gio_c_args,
  # intl.lib is not compatible with SAFESEH
  link_args : noseh_link_args,
  dependencies : [libintl, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
@ -901,7 +898,7 @@ executable('gdbus', 'gdbus-tool.c',
 if host_system != 'windows'
  executable('gapplication', 'gapplication-tool.c',
    install : true,
-    c_args : ['-DHAVE_CONFIG_H=1'] + gio_c_args,
+    c_args : gio_c_args,
    # intl.lib is not compatible with SAFESEH
    link_args : noseh_link_args,
    dependencies : [libintl, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
--- a/gio/tests/gdbus-object-manager-example/meson.build
+++ b/gio/tests/gdbus-object-manager-example/meson.build
@ -16,7 +16,7 @@ gdbus_example_objectmanager_generated = custom_target('gdbus-example-objectmanag

 libgdbus_example_objectmanager = library('libgdbus-example-objectmanager',
    gdbus_example_objectmanager_generated,
-    c_args : ['-DHAVE_CONFIG_H=1'] + gio_c_args,
+    c_args : gio_c_args,
    dependencies : [libglib_dep, libgmodule_dep, libgobject_dep, libgio_dep],
    install : false)

--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
@ -75,7 +75,6 @@ test_env = [
 ]

 test_c_args = [
-  '-DHAVE_CONFIG_H=1',
  '-DG_LOG_DOMAIN="GLib-GIO"',
  '-DTEST_SERVICES="@0@/gio/tests/services"'.format(meson.build_root()),
  '-DGLIB_MKENUMS="@0@"'.format(glib_mkenums),
--- a/gio/win32/meson.build
+++ b/gio/win32/meson.build
@ -12,4 +12,4 @@ giowin32_lib = static_library('giowin32',
  include_directories : [configinc, glibinc, gioinc, gmoduleinc],
  dependencies : [libintl],
  pic : true,
-  c_args : [ '-DHAVE_CONFIG_H', '-DG_DISABLE_DEPRECATED' ] + gio_c_args)
+  c_args : [ '-DG_DISABLE_DEPRECATED' ] + gio_c_args)
--- a/gio/xdgmime/meson.build
+++ b/gio/xdgmime/meson.build
@ -13,4 +13,4 @@ xdgmime_lib = static_library('xdgmime',
  sources : xdgmime_sources,
  include_directories : [configinc],
  pic : true,
-  c_args : [ '-DHAVE_CONFIG_H', '-DXDG_PREFIX=_gio_xdg' ] + glib_hidden_visibility_args)
+  c_args : [ '-DXDG_PREFIX=_gio_xdg' ] + glib_hidden_visibility_args)
--- a/gio/xdgmime/xdgmime.c
+++ b/gio/xdgmime/xdgmime.c
@ -23,9 +23,7 @@
 * License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include "xdgmime.h"
 #include "xdgmimeint.h"
--- a/gio/xdgmime/xdgmimealias.c
+++ b/gio/xdgmime/xdgmimealias.c
@ -23,9 +23,7 @@
 * License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include "xdgmimealias.h"
 #include "xdgmimeint.h"
--- a/gio/xdgmime/xdgmimecache.c
+++ b/gio/xdgmime/xdgmimecache.c
@ -22,9 +22,7 @@
 * License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include <stdio.h>
 #include <stdlib.h>
--- a/gio/xdgmime/xdgmimeglob.c
+++ b/gio/xdgmime/xdgmimeglob.c
@ -23,9 +23,7 @@
 * License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include "xdgmimeglob.h"
 #include "xdgmimeint.h"
--- a/gio/xdgmime/xdgmimeicon.c
+++ b/gio/xdgmime/xdgmimeicon.c
@ -22,9 +22,7 @@
 * License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include "xdgmimeicon.h"
 #include "xdgmimeint.h"
--- a/gio/xdgmime/xdgmimeint.c
+++ b/gio/xdgmime/xdgmimeint.c
@ -23,9 +23,7 @@
 * License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include "xdgmimeint.h"
 #include <ctype.h>
--- a/gio/xdgmime/xdgmimemagic.c
+++ b/gio/xdgmime/xdgmimemagic.c
@ -23,9 +23,7 @@
 * License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include <assert.h>
 #include "xdgmimemagic.h"
--- a/gio/xdgmime/xdgmimeparent.c
+++ b/gio/xdgmime/xdgmimeparent.c
@ -23,9 +23,7 @@
 * License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include "xdgmimeparent.h"
 #include "xdgmimeint.h"
--- a/glib/gnulib/asnprintf.c
+++ b/glib/gnulib/asnprintf.c
@ -14,9 +14,7 @@
   You should have received a copy of the GNU Lesser General Public License along
   with this program; if not, see <http://www.gnu.org/licenses/>.  */

-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>

 #include "g-gnulib.h"

--- a/glib/gnulib/printf-parse.c
+++ b/glib/gnulib/printf-parse.c
@ -27,9 +27,7 @@
     STATIC             Set to 'static' to declare the function static.
     ENABLE_UNISTDIO    Set to 1 to enable the unistdio extensions.  */

-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>

 #include "g-gnulib.h"

--- a/glib/gnulib/printf.c
+++ b/glib/gnulib/printf.c
@ -22,9 +22,7 @@
 * GLib at ftp://ftp.gtk.org/pub/gtk/. 
 */

-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
--- a/glib/meson.build
+++ b/glib/meson.build
@ -255,31 +255,28 @@ if host_system == 'windows'
    executable('gspawn-win32-helper', 'gspawn-win32-helper.c',
      install : true,
      gui_app : true,
-      c_args : ['-DHAVE_CONFIG_H=1'],
      include_directories : configinc,
      dependencies : [libintl, libglib_dep])
    executable('gspawn-win32-helper-console', 'gspawn-win32-helper.c',
      install : true,
-      c_args : ['-DHAVE_CONFIG_H=1', '-DHELPER_CONSOLE'],
+      c_args : ['-DHELPER_CONSOLE'],
      include_directories : configinc,
      dependencies : [libintl, libglib_dep])
  else
    executable('gspawn-win64-helper', 'gspawn-win32-helper.c',
      install : true,
      gui_app : true,
-      c_args : ['-DHAVE_CONFIG_H=1'],
      include_directories : configinc,
      dependencies : [libintl, libglib_dep])
    executable('gspawn-win64-helper-console', 'gspawn-win32-helper.c',
      install : true,
-      c_args : ['-DHAVE_CONFIG_H=1', '-DHELPER_CONSOLE'],
+      c_args : ['-DHELPER_CONSOLE'],
      include_directories : configinc,
      dependencies : [libintl, libglib_dep])
  endif
 else
  gtester = executable('gtester', 'gtester.c',
    install : true,
-    c_args : ['-DHAVE_CONFIG_H=1'],
    include_directories : configinc,
    dependencies : [libglib_dep])
 endif
--- a/glib/pcre/Makefile.am
+++ b/glib/pcre/Makefile.am
@ -4,7 +4,6 @@ noinst_LTLIBRARIES += libpcre.la

 libpcre_la_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"GLib-GRegex\" \
-	-DHAVE_CONFIG_H \
 	-DHAVE_MEMMOVE \
 	-DSUPPORT_UCP \
 	-DSUPPORT_UTF \
--- a/glib/pcre/pcre_byte_order.c
+++ b/glib/pcre/pcre_byte_order.c
@ -43,9 +43,7 @@ see if it was compiled with the opposite endianness. If so, it uses an
 auxiliary local function to flip the appropriate bytes. */


-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include "pcre_internal.h"

--- a/glib/pcre/pcre_chartables.c
+++ b/glib/pcre/pcre_chartables.c
@ -20,9 +20,7 @@ and dead code stripping is activated. This leads to link errors. Pulling in the
 header ensures that the array gets flagged as "someone outside this compilation
 unit might reference this" and so it will always be supplied to the linker. */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include "pcre_internal.h"

--- a/glib/pcre/pcre_compile.c
+++ b/glib/pcre/pcre_compile.c
@ -42,9 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
 supporting internal functions that are not used by other modules. */


-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #define NLBLOCK cd             /* Block containing newline information */
 #define PSSTART start_pattern  /* Field containing processed string start */
--- a/glib/pcre/pcre_config.c
+++ b/glib/pcre/pcre_config.c
@ -41,9 +41,7 @@ POSSIBILITY OF SUCH DAMAGE.
 /* This module contains the external function pcre_config(). */


-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 /* Keep the original link size. */
 static int real_link_size = LINK_SIZE;
--- a/glib/pcre/pcre_dfa_exec.c
+++ b/glib/pcre/pcre_dfa_exec.c
@ -72,9 +72,7 @@ in others, so I abandoned this code. */



-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #define NLBLOCK md             /* Block containing newline information */
 #define PSSTART start_subject  /* Field containing processed string start */
--- a/glib/pcre/pcre_exec.c
+++ b/glib/pcre/pcre_exec.c
@ -41,9 +41,7 @@ POSSIBILITY OF SUCH DAMAGE.
 pattern matching using an NFA algorithm, trying to mimic Perl as closely as
 possible. There are also some static supporting functions. */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #define NLBLOCK md             /* Block containing newline information */
 #define PSSTART start_subject  /* Field containing processed string start */
--- a/glib/pcre/pcre_fullinfo.c
+++ b/glib/pcre/pcre_fullinfo.c
@ -42,9 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
 information about a compiled pattern. */


-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include "pcre_internal.h"

--- a/glib/pcre/pcre_get.c
+++ b/glib/pcre/pcre_get.c
@ -43,9 +43,7 @@ from the subject string after a regex match has succeeded. The original idea
 for these functions came from Scott Wimer. */


-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include "pcre_internal.h"

--- a/glib/pcre/pcre_globals.c
+++ b/glib/pcre/pcre_globals.c
@ -52,9 +52,7 @@ a local function is used.
 Also, when compiling for Virtual Pascal, things are done differently, and
 global variables are not used. */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include "pcre_internal.h"

--- a/glib/pcre/pcre_jit_compile.c
+++ b/glib/pcre/pcre_jit_compile.c
@ -40,9 +40,7 @@ POSSIBILITY OF SUCH DAMAGE.
 -----------------------------------------------------------------------------
 */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include "pcre_internal.h"

--- a/glib/pcre/pcre_newline.c
+++ b/glib/pcre/pcre_newline.c
@ -47,9 +47,7 @@ and NLTYPE_ANY. The full list of Unicode newline characters is taken from
 http://unicode.org/unicode/reports/tr18/. */


-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include "pcre_internal.h"

--- a/glib/pcre/pcre_ord2utf8.c
+++ b/glib/pcre/pcre_ord2utf8.c
@ -41,9 +41,7 @@ POSSIBILITY OF SUCH DAMAGE.
 /* This file contains a private PCRE function that converts an ordinal
 character value into a UTF8 string. */

-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include "pcre_internal.h"

--- a/glib/pcre/pcre_string_utils.c
+++ b/glib/pcre/pcre_string_utils.c
@ -42,9 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
 class. It is used by both pcre_exec() and pcre_def_exec(). */


-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include "pcre_internal.h"

--- a/glib/pcre/pcre_study.c
+++ b/glib/pcre/pcre_study.c
@ -42,9 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
 supporting functions. */


-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include "pcre_internal.h"

--- a/glib/pcre/pcre_tables.c
+++ b/glib/pcre/pcre_tables.c
@ -45,9 +45,7 @@ uses macros to change their names from _pcre_xxx to xxxx, thereby avoiding name
 clashes with the library. */


-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include "pcre_internal.h"

--- a/glib/pcre/pcre_valid_utf8.c
+++ b/glib/pcre/pcre_valid_utf8.c
@ -42,9 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
 strings. */


-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include "pcre_internal.h"

--- a/glib/pcre/pcre_version.c
+++ b/glib/pcre/pcre_version.c
@ -42,9 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
 string that identifies the PCRE version that is in use. */


-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include "pcre_internal.h"

--- a/glib/pcre/pcre_xclass.c
+++ b/glib/pcre/pcre_xclass.c
@ -42,9 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
 class. It is used by both pcre_exec() and pcre_def_exec(). */


-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif

 #include "pcre_internal.h"

--- a/glib/tests/hash.c
+++ b/glib/tests/hash.c
@ -26,9 +26,7 @@
 #undef G_DISABLE_ASSERT
 #undef G_LOG_DOMAIN

-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
+#include <config.h>

 #include <stdio.h>
 #include <string.h>
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
@ -96,7 +96,7 @@ test_env = [
  'MALLOC_PERTURB_=@0@'.format(random_number % 256),
 ]

-test_cargs = ['-DHAVE_CONFIG_H=1', '-DG_LOG_DOMAIN="GLib"']
+test_cargs = ['-DG_LOG_DOMAIN="GLib"']

 # Tests that consistently time out on the CI infrastructure
 slow_tests = [
--- a/gobject/meson.build
+++ b/gobject/meson.build
@ -98,7 +98,6 @@ endforeach

 executable('gobject-query', 'gobject-query.c',
  install : true,
-  c_args : ['-DHAVE_CONFIG_H=1'],
  dependencies : [libglib_dep, libgobject_dep])

 install_data('gobject_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb'))
--- a/gobject/tests/meson.build
+++ b/gobject/tests/meson.build
@ -38,7 +38,7 @@ foreach test_name : gobject_tests
    test_name = 'gobject-private'
  endif
  exe = executable(test_name, test_src,
-      c_args : ['-DHAVE_CONFIG_H=1', '-DG_LOG_DOMAIN="GLib-GObject"'],
+      c_args : ['-DG_LOG_DOMAIN="GLib-GObject"'],
      dependencies : deps,
  )
  test(test_name, exe, env : test_env)
@ -74,7 +74,7 @@ marshalers_c = custom_target('marshalers_c',

 exe = executable('signals',
    'signals.c', marshalers_h, marshalers_c,
-    c_args : ['-DHAVE_CONFIG_H=1', '-DG_LOG_DOMAIN="GLib-GObject"'],
+    c_args : ['-DG_LOG_DOMAIN="GLib-GObject"'],
    dependencies : deps,
 )
 test('signals', exe, env : test_env)
--- a/tests/meson.build
+++ b/tests/meson.build
@ -7,7 +7,7 @@ test_env = [
  'MALLOC_CHECK_=2',
 ]

-test_cargs = ['-DHAVE_CONFIG_H=1', '-DG_LOG_DOMAIN="GLib"']
+test_cargs = ['-DG_LOG_DOMAIN="GLib"']

 subdir('gobject')
 subdir('refcount')
--- a/win32/vs10/glib-build-defines.props
+++ b/win32/vs10/glib-build-defines.props
@ -27,7 +27,7 @@
  <ItemDefinitionGroup>
    <ClCompile>
      <AdditionalIncludeDirectories>..\..;..\..\glib;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>
--- a/win32/vs9/glib-build-defines.vsprops
+++ b/win32/vs9/glib-build-defines.vsprops
@ -10,7 +10,7 @@
 	<Tool
 		Name="VCCLCompilerTool"
 		AdditionalIncludeDirectories="..\..;..\..\glib;$(GlibEtcInstallRoot)\include"
-		PreprocessorDefinitions="HAVE_CONFIG_H"
+		PreprocessorDefinitions=""
 		ForcedIncludeFiles="msvc_recommended_pragmas.h"
 		AdditionalOptions="/MP"
 	/>