diff options
| author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2020-03-01 10:25:28 +0100 |
|---|---|---|
| committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2020-03-01 10:25:28 +0100 |
| commit | 1df52bb90b7ca3780043b16acf5bb5eb483876f8 (patch) | |
| tree | 63f544406fd90242e1a655db8dadb53145cebd8d /glib/glibmm | |
| parent | ebb6c5bf57c9bb28025c2a292699406f995dfbd4 (diff) | |
| download | glibmm-1df52bb90b7ca3780043b16acf5bb5eb483876f8.tar.gz | |
Prepare existing files for building with Meson
* examples/network/resolver.cc: Don't include config.h. It's not used.
* glib/glibmm/ustring.cc: Check if GLIBMM_SIZEOF_WCHAR_T is defined.
* tools/generate_wrap_init.pl.in:
* tools/gmmproc.in: Change '\@' to '\ @'. Meson's configure_file()
removes a backslash immediately before an at-sign.
Diffstat (limited to 'glib/glibmm')
| -rw-r--r-- | glib/glibmm/ustring.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/glib/glibmm/ustring.cc b/glib/glibmm/ustring.cc index 1a5026f4..ebf7c0dd 100644 --- a/glib/glibmm/ustring.cc +++ b/glib/glibmm/ustring.cc @@ -29,6 +29,14 @@ #include <config.h> #endif +// If glibmm is built with Autotools, GLIBMM_SIZEOF_WCHAR_T is not defined and +// SIZEOF_WCHAR_T is defined in config.h. +// If glibmm is built with Meson, config.h does not exist and +// GLIBMM_SIZEOF_WCHAR_T is defined in glibmmconfig.h. +#if !defined(SIZEOF_WCHAR_T) && defined(GLIBMM_SIZEOF_WCHAR_T) +#define SIZEOF_WCHAR_T GLIBMM_SIZEOF_WCHAR_T +#endif + namespace { |