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.

2 files changed, 7 insertions, 3 deletions

diff --git a/tools/generate_wrap_init.pl.in b/tools/generate_wrap_init.pl.in
index cf573477..6e4dcf3c 100644
--- a/tools/generate_wrap_init.pl.in
+++ b/tools/generate_wrap_init.pl.in
@@ -151,14 +151,16 @@ while ($ARGV[0])
       my $basename = lc($ccast);
       my @names = ($cppname, $basename, @extra_namespace);
 
+      # Don't remove the space between \ and @. When glibmm is built with Meson,
+      # the \ would be removed in generate_wrap_int.pl.
       if ($type_of_class eq "_CLASS_GOBJECT" or
           $type_of_class eq "_CLASS_GTKOBJECT")
       {
-        push(@{$objects{$filename_header}}, \@names);
+        push(@{$objects{$filename_header}}, \ @names);
       }
       elsif ($type_of_class eq "_WRAP_GERROR")
       {
-        push(@{$exceptions{$filename_header}}, \@names);
+        push(@{$exceptions{$filename_header}}, \ @names);
       }
     }
     elsif (/\b_INCLUDE_IN_WRAP_INIT\((.+)\)/)
diff --git a/tools/gmmproc.in b/tools/gmmproc.in
index 56b44e62..264955fa 100644
--- a/tools/gmmproc.in
+++ b/tools/gmmproc.in
@@ -73,7 +73,9 @@ sub parse_command_line_args();
 #main()
 parse_command_line_args();
 
-my $objOutputter = &Output::new($main::m4path, \@main::macrodirs);
+# Don't remove the space between \ and @. When glibmm is built with Meson,
+# the \ would be removed in gmmproc.
+my $objOutputter = &Output::new($main::m4path, \ @main::macrodirs);
 my $objWrapParser = &WrapParser::new($objOutputter);
 
 $$objWrapParser{srcdir} = $main::srcdir;