Commit 03e86d00 authored by Ernestas Kulik's avatar Ernestas Kulik 🦑 Committed by Philip Withnall

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
parent 9d24c8b2
Pipeline #3840 passed with stage
in 3 minutes and 14 seconds
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include" AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIB_COMPILATION;DLL_EXPORT;HAVE_CONFIG_H;G_LOG_DOMAIN=\"Glib\";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=\"Glib\";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" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../..;../../../glib;../../../../dependencies/proxy-libintl-20080418/include" 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" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../../glib;../../.." 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" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../../glib;../../.." 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" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../..,../../../glib" 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" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
WholeProgramOptimization="false" WholeProgramOptimization="false"
AdditionalIncludeDirectories="../../..,../../../glib" 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" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../..,../../../glib" 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" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../..,../../../glib" 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" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
......
...@@ -12,4 +12,4 @@ inotify_lib = static_library('inotify', ...@@ -12,4 +12,4 @@ inotify_lib = static_library('inotify',
include_directories : [configinc, glibinc, gmoduleinc], include_directories : [configinc, glibinc, gmoduleinc],
dependencies : [gioenumtypes_dep], dependencies : [gioenumtypes_dep],
pic : true, pic : true,
c_args : [ '-DHAVE_CONFIG_H', '-DG_DISABLE_DEPRECATED' ] + gio_c_args) c_args : [ '-DG_DISABLE_DEPRECATED' ] + gio_c_args)
...@@ -15,4 +15,4 @@ kqueue_lib = static_library('kqueue', ...@@ -15,4 +15,4 @@ kqueue_lib = static_library('kqueue',
sources : kqueue_sources, sources : kqueue_sources,
include_directories : [configinc, glibinc, gmoduleinc], include_directories : [configinc, glibinc, gmoduleinc],
pic : true, pic : true,
c_args : [ '-DHAVE_CONFIG_H', '-DG_DISABLE_DEPRECATED' ] + gio_c_args) c_args : [ '-DG_DISABLE_DEPRECATED' ] + gio_c_args)
...@@ -841,24 +841,22 @@ gio_tool_sources = [ ...@@ -841,24 +841,22 @@ gio_tool_sources = [
'gio-tool-tree.c', 'gio-tool-tree.c',
] ]
# FIXME: are all these HAVE_CONFIG_H needed/used here?
executable('gio', gio_tool_sources, executable('gio', gio_tool_sources,
install : true, install : true,
c_args : ['-DHAVE_CONFIG_H=1'] + gio_c_args, c_args : gio_c_args,
# intl.lib is not compatible with SAFESEH # intl.lib is not compatible with SAFESEH
link_args : noseh_link_args, link_args : noseh_link_args,
dependencies : [libintl, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep]) dependencies : [libintl, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
executable('gresource', 'gresource-tool.c', executable('gresource', 'gresource-tool.c',
install : true, install : true,
c_args : ['-DHAVE_CONFIG_H=1'],
# intl.lib is not compatible with SAFESEH # intl.lib is not compatible with SAFESEH
link_args : noseh_link_args, link_args : noseh_link_args,
dependencies : [libelf, libintl, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep]) dependencies : [libelf, libintl, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
executable('gio-querymodules', 'gio-querymodules.c', 'giomodule-priv.c', executable('gio-querymodules', 'gio-querymodules.c', 'giomodule-priv.c',
install : true, install : true,
c_args : ['-DHAVE_CONFIG_H=1'] + gio_c_args, c_args : gio_c_args,
# intl.lib is not compatible with SAFESEH # intl.lib is not compatible with SAFESEH
link_args : noseh_link_args, link_args : noseh_link_args,
dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep]) dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
...@@ -866,7 +864,6 @@ executable('gio-querymodules', 'gio-querymodules.c', 'giomodule-priv.c', ...@@ -866,7 +864,6 @@ executable('gio-querymodules', 'gio-querymodules.c', 'giomodule-priv.c',
glib_compile_schemas = executable('glib-compile-schemas', glib_compile_schemas = executable('glib-compile-schemas',
[gconstructor_as_data_h, 'gvdb/gvdb-builder.c', 'glib-compile-schemas.c'], [gconstructor_as_data_h, 'gvdb/gvdb-builder.c', 'glib-compile-schemas.c'],
install : true, install : true,
c_args : ['-DHAVE_CONFIG_H=1'],
# intl.lib is not compatible with SAFESEH # intl.lib is not compatible with SAFESEH
link_args : noseh_link_args, link_args : noseh_link_args,
dependencies : [libintl, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep]) dependencies : [libintl, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
...@@ -874,14 +871,14 @@ glib_compile_schemas = executable('glib-compile-schemas', ...@@ -874,14 +871,14 @@ glib_compile_schemas = executable('glib-compile-schemas',
glib_compile_resources = executable('glib-compile-resources', glib_compile_resources = executable('glib-compile-resources',
[gconstructor_as_data_h, 'gvdb/gvdb-builder.c', 'glib-compile-resources.c'], [gconstructor_as_data_h, 'gvdb/gvdb-builder.c', 'glib-compile-resources.c'],
install : true, install : true,
c_args : ['-DHAVE_CONFIG_H=1'] + gio_c_args, c_args : gio_c_args,
# intl.lib is not compatible with SAFESEH # intl.lib is not compatible with SAFESEH
link_args : noseh_link_args, link_args : noseh_link_args,
dependencies : [libintl, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep]) dependencies : [libintl, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
executable('gsettings', 'gsettings-tool.c', executable('gsettings', 'gsettings-tool.c',
install : true, install : true,
c_args : ['-DHAVE_CONFIG_H=1'] + gio_c_args, c_args : gio_c_args,
# intl.lib is not compatible with SAFESEH # intl.lib is not compatible with SAFESEH
link_args : noseh_link_args, link_args : noseh_link_args,
dependencies : [libintl, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep]) dependencies : [libintl, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
...@@ -893,7 +890,7 @@ install_data(['gschema.loc', 'gschema.its'], ...@@ -893,7 +890,7 @@ install_data(['gschema.loc', 'gschema.its'],
executable('gdbus', 'gdbus-tool.c', executable('gdbus', 'gdbus-tool.c',
install : true, install : true,
c_args : ['-DHAVE_CONFIG_H=1'] + gio_c_args, c_args : gio_c_args,
# intl.lib is not compatible with SAFESEH # intl.lib is not compatible with SAFESEH
link_args : noseh_link_args, link_args : noseh_link_args,
dependencies : [libintl, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep]) dependencies : [libintl, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
...@@ -901,7 +898,7 @@ executable('gdbus', 'gdbus-tool.c', ...@@ -901,7 +898,7 @@ executable('gdbus', 'gdbus-tool.c',
if host_system != 'windows' if host_system != 'windows'
executable('gapplication', 'gapplication-tool.c', executable('gapplication', 'gapplication-tool.c',
install : true, install : true,
c_args : ['-DHAVE_CONFIG_H=1'] + gio_c_args, c_args : gio_c_args,
# intl.lib is not compatible with SAFESEH # intl.lib is not compatible with SAFESEH
link_args : noseh_link_args, link_args : noseh_link_args,
dependencies : [libintl, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep]) dependencies : [libintl, libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep])
......
...@@ -16,7 +16,7 @@ gdbus_example_objectmanager_generated = custom_target('gdbus-example-objectmanag ...@@ -16,7 +16,7 @@ gdbus_example_objectmanager_generated = custom_target('gdbus-example-objectmanag
libgdbus_example_objectmanager = library('libgdbus-example-objectmanager', libgdbus_example_objectmanager = library('libgdbus-example-objectmanager',
gdbus_example_objectmanager_generated, 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], dependencies : [libglib_dep, libgmodule_dep, libgobject_dep, libgio_dep],
install : false) install : false)
......
...@@ -75,7 +75,6 @@ test_env = [ ...@@ -75,7 +75,6 @@ test_env = [
] ]
test_c_args = [ test_c_args = [
'-DHAVE_CONFIG_H=1',
'-DG_LOG_DOMAIN="GLib-GIO"', '-DG_LOG_DOMAIN="GLib-GIO"',
'-DTEST_SERVICES="@0@/gio/tests/services"'.format(meson.build_root()), '-DTEST_SERVICES="@0@/gio/tests/services"'.format(meson.build_root()),
'-DGLIB_MKENUMS="@0@"'.format(glib_mkenums), '-DGLIB_MKENUMS="@0@"'.format(glib_mkenums),
......
...@@ -12,4 +12,4 @@ giowin32_lib = static_library('giowin32', ...@@ -12,4 +12,4 @@ giowin32_lib = static_library('giowin32',
include_directories : [configinc, glibinc, gioinc, gmoduleinc], include_directories : [configinc, glibinc, gioinc, gmoduleinc],
dependencies : [libintl], dependencies : [libintl],
pic : true, pic : true,
c_args : [ '-DHAVE_CONFIG_H', '-DG_DISABLE_DEPRECATED' ] + gio_c_args) c_args : [ '-DG_DISABLE_DEPRECATED' ] + gio_c_args)
...@@ -13,4 +13,4 @@ xdgmime_lib = static_library('xdgmime', ...@@ -13,4 +13,4 @@ xdgmime_lib = static_library('xdgmime',
sources : xdgmime_sources, sources : xdgmime_sources,
include_directories : [configinc], include_directories : [configinc],
pic : true, 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)
...@@ -23,9 +23,7 @@ ...@@ -23,9 +23,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "xdgmime.h" #include "xdgmime.h"
#include "xdgmimeint.h" #include "xdgmimeint.h"
......
...@@ -23,9 +23,7 @@ ...@@ -23,9 +23,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "xdgmimealias.h" #include "xdgmimealias.h"
#include "xdgmimeint.h" #include "xdgmimeint.h"
......
...@@ -22,9 +22,7 @@ ...@@ -22,9 +22,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
......
...@@ -23,9 +23,7 @@ ...@@ -23,9 +23,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "xdgmimeglob.h" #include "xdgmimeglob.h"
#include "xdgmimeint.h" #include "xdgmimeint.h"
......
...@@ -22,9 +22,7 @@ ...@@ -22,9 +22,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "xdgmimeicon.h" #include "xdgmimeicon.h"
#include "xdgmimeint.h" #include "xdgmimeint.h"
......
...@@ -23,9 +23,7 @@ ...@@ -23,9 +23,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "xdgmimeint.h" #include "xdgmimeint.h"
#include <ctype.h> #include <ctype.h>
......
...@@ -23,9 +23,7 @@ ...@@ -23,9 +23,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include <assert.h> #include <assert.h>
#include "xdgmimemagic.h" #include "xdgmimemagic.h"
......
...@@ -23,9 +23,7 @@ ...@@ -23,9 +23,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "xdgmimeparent.h" #include "xdgmimeparent.h"
#include "xdgmimeint.h" #include "xdgmimeint.h"
......
...@@ -14,9 +14,7 @@ ...@@ -14,9 +14,7 @@
You should have received a copy of the GNU Lesser General Public License along 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/>. */ with this program; if not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_CONFIG_H #include <config.h>
# include <config.h>
#endif
#include "g-gnulib.h" #include "g-gnulib.h"
......
...@@ -27,9 +27,7 @@ ...@@ -27,9 +27,7 @@
STATIC Set to 'static' to declare the function static. STATIC Set to 'static' to declare the function static.
ENABLE_UNISTDIO Set to 1 to enable the unistdio extensions. */ ENABLE_UNISTDIO Set to 1 to enable the unistdio extensions. */
#ifdef HAVE_CONFIG_H #include <config.h>
# include <config.h>
#endif
#include "g-gnulib.h" #include "g-gnulib.h"
......
...@@ -22,9 +22,7 @@ ...@@ -22,9 +22,7 @@
* GLib at ftp://ftp.gtk.org/pub/gtk/. * GLib at ftp://ftp.gtk.org/pub/gtk/.
*/ */
#ifdef HAVE_CONFIG_H #include <config.h>
# include <config.h>
#endif
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
......
...@@ -255,31 +255,28 @@ if host_system == 'windows' ...@@ -255,31 +255,28 @@ if host_system == 'windows'
executable('gspawn-win32-helper', 'gspawn-win32-helper.c', executable('gspawn-win32-helper', 'gspawn-win32-helper.c',
install : true, install : true,
gui_app : true, gui_app : true,
c_args : ['-DHAVE_CONFIG_H=1'],
include_directories : configinc, include_directories : configinc,
dependencies : [libintl, libglib_dep]) dependencies : [libintl, libglib_dep])
executable('gspawn-win32-helper-console', 'gspawn-win32-helper.c', executable('gspawn-win32-helper-console', 'gspawn-win32-helper.c',
install : true, install : true,
c_args : ['-DHAVE_CONFIG_H=1', '-DHELPER_CONSOLE'], c_args : ['-DHELPER_CONSOLE'],
include_directories : configinc, include_directories : configinc,
dependencies : [libintl, libglib_dep]) dependencies : [libintl, libglib_dep])
else else
executable('gspawn-win64-helper', 'gspawn-win32-helper.c', executable('gspawn-win64-helper', 'gspawn-win32-helper.c',
install : true, install : true,
gui_app : true, gui_app : true,
c_args : ['-DHAVE_CONFIG_H=1'],
include_directories : configinc, include_directories : configinc,
dependencies : [libintl, libglib_dep]) dependencies : [libintl, libglib_dep])
executable('gspawn-win64-helper-console', 'gspawn-win32-helper.c', executable('gspawn-win64-helper-console', 'gspawn-win32-helper.c',
install : true, install : true,
c_args : ['-DHAVE_CONFIG_H=1', '-DHELPER_CONSOLE'], c_args : ['-DHELPER_CONSOLE'],
include_directories : configinc, include_directories : configinc,
dependencies : [libintl, libglib_dep]) dependencies : [libintl, libglib_dep])
endif endif
else else
gtester = executable('gtester', 'gtester.c', gtester = executable('gtester', 'gtester.c',
install : true, install : true,
c_args : ['-DHAVE_CONFIG_H=1'],
include_directories : configinc, include_directories : configinc,
dependencies : [libglib_dep]) dependencies : [libglib_dep])
endif endif
......
...@@ -4,7 +4,6 @@ noinst_LTLIBRARIES += libpcre.la ...@@ -4,7 +4,6 @@ noinst_LTLIBRARIES += libpcre.la
libpcre_la_CPPFLAGS = \ libpcre_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"GLib-GRegex\" \ -DG_LOG_DOMAIN=\"GLib-GRegex\" \
-DHAVE_CONFIG_H \
-DHAVE_MEMMOVE \ -DHAVE_MEMMOVE \
-DSUPPORT_UCP \ -DSUPPORT_UCP \
-DSUPPORT_UTF \ -DSUPPORT_UTF \
......
...@@ -43,9 +43,7 @@ see if it was compiled with the opposite endianness. If so, it uses an ...@@ -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. */ auxiliary local function to flip the appropriate bytes. */
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "pcre_internal.h" #include "pcre_internal.h"
......
...@@ -20,9 +20,7 @@ and dead code stripping is activated. This leads to link errors. Pulling in the ...@@ -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 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. */ unit might reference this" and so it will always be supplied to the linker. */
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "pcre_internal.h" #include "pcre_internal.h"
......
...@@ -42,9 +42,7 @@ POSSIBILITY OF SUCH DAMAGE. ...@@ -42,9 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
supporting internal functions that are not used by other modules. */ supporting internal functions that are not used by other modules. */
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#define NLBLOCK cd /* Block containing newline information */ #define NLBLOCK cd /* Block containing newline information */
#define PSSTART start_pattern /* Field containing processed string start */ #define PSSTART start_pattern /* Field containing processed string start */
......
...@@ -41,9 +41,7 @@ POSSIBILITY OF SUCH DAMAGE. ...@@ -41,9 +41,7 @@ POSSIBILITY OF SUCH DAMAGE.
/* This module contains the external function pcre_config(). */ /* This module contains the external function pcre_config(). */
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
/* Keep the original link size. */ /* Keep the original link size. */
static int real_link_size = LINK_SIZE; static int real_link_size = LINK_SIZE;
......
...@@ -72,9 +72,7 @@ in others, so I abandoned this code. */ ...@@ -72,9 +72,7 @@ in others, so I abandoned this code. */
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#define NLBLOCK md /* Block containing newline information */ #define NLBLOCK md /* Block containing newline information */
#define PSSTART start_subject /* Field containing processed string start */ #define PSSTART start_subject /* Field containing processed string start */
......
...@@ -41,9 +41,7 @@ POSSIBILITY OF SUCH DAMAGE. ...@@ -41,9 +41,7 @@ POSSIBILITY OF SUCH DAMAGE.
pattern matching using an NFA algorithm, trying to mimic Perl as closely as pattern matching using an NFA algorithm, trying to mimic Perl as closely as
possible. There are also some static supporting functions. */ possible. There are also some static supporting functions. */
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#define NLBLOCK md /* Block containing newline information */ #define NLBLOCK md /* Block containing newline information */
#define PSSTART start_subject /* Field containing processed string start */ #define PSSTART start_subject /* Field containing processed string start */
......
...@@ -42,9 +42,7 @@ POSSIBILITY OF SUCH DAMAGE. ...@@ -42,9 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
information about a compiled pattern. */ information about a compiled pattern. */
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "pcre_internal.h" #include "pcre_internal.h"
......
...@@ -43,9 +43,7 @@ from the subject string after a regex match has succeeded. The original idea ...@@ -43,9 +43,7 @@ from the subject string after a regex match has succeeded. The original idea
for these functions came from Scott Wimer. */ for these functions came from Scott Wimer. */
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "pcre_internal.h" #include "pcre_internal.h"
......
...@@ -52,9 +52,7 @@ a local function is used. ...@@ -52,9 +52,7 @@ a local function is used.
Also, when compiling for Virtual Pascal, things are done differently, and Also, when compiling for Virtual Pascal, things are done differently, and
global variables are not used. */ global variables are not used. */
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "pcre_internal.h" #include "pcre_internal.h"
......
...@@ -40,9 +40,7 @@ POSSIBILITY OF SUCH DAMAGE. ...@@ -40,9 +40,7 @@ POSSIBILITY OF SUCH DAMAGE.
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "pcre_internal.h" #include "pcre_internal.h"
......
...@@ -47,9 +47,7 @@ and NLTYPE_ANY. The full list of Unicode newline characters is taken from ...@@ -47,9 +47,7 @@ and NLTYPE_ANY. The full list of Unicode newline characters is taken from
http://unicode.org/unicode/reports/tr18/. */ http://unicode.org/unicode/reports/tr18/. */
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "pcre_internal.h" #include "pcre_internal.h"
......
...@@ -41,9 +41,7 @@ POSSIBILITY OF SUCH DAMAGE. ...@@ -41,9 +41,7 @@ POSSIBILITY OF SUCH DAMAGE.
/* This file contains a private PCRE function that converts an ordinal /* This file contains a private PCRE function that converts an ordinal
character value into a UTF8 string. */ character value into a UTF8 string. */
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "pcre_internal.h" #include "pcre_internal.h"
......
...@@ -42,9 +42,7 @@ POSSIBILITY OF SUCH DAMAGE. ...@@ -42,9 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
class. It is used by both pcre_exec() and pcre_def_exec(). */ class. It is used by both pcre_exec() and pcre_def_exec(). */
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "pcre_internal.h" #include "pcre_internal.h"
......
...@@ -42,9 +42,7 @@ POSSIBILITY OF SUCH DAMAGE. ...@@ -42,9 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
supporting functions. */ supporting functions. */
#ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif
#include "pcre_internal.h" #include "pcre_internal.h"
......
...@@ -45,9 +45,7 @@ uses macros to change their names from _pcre_xxx to xxxx, thereby avoiding name ...@@ -45,9 +45,7 @@ uses macros to change their names from _pcre_xxx to xxxx, thereby avoiding name
clashes with the library. */ clashes with the library. */