diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-09-29 10:17:14 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-09-29 10:18:17 +0900 |
| commit | c2ad1ac67f0cb8ef0afaa796c168f1dd904b7bf2 (patch) | |
| tree | 2f61c43ebda61b073a0c4f76cd5b923849d91942 /gobject | |
| parent | 1d41222b881dd282aaeea02eb3d6eb926629511d (diff) | |
| download | glib-c2ad1ac67f0cb8ef0afaa796c168f1dd904b7bf2.tar.gz glib-c2ad1ac67f0cb8ef0afaa796c168f1dd904b7bf2.tar.bz2 glib-c2ad1ac67f0cb8ef0afaa796c168f1dd904b7bf2.zip | |
Imported Upstream version 2.53.7
Change-Id: I8b9315cea2a8fe73f3fbc91010836219d67b4dbf
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'gobject')
| -rwxr-xr-x | gobject/glib-genmarshal.in | 11 | ||||
| -rw-r--r-- | gobject/gobject.rc | 8 |
2 files changed, 12 insertions, 7 deletions
diff --git a/gobject/glib-genmarshal.in b/gobject/glib-genmarshal.in index ed6de0ae8..09e84083f 100755 --- a/gobject/glib-genmarshal.in +++ b/gobject/glib-genmarshal.in @@ -556,7 +556,7 @@ def generate_prototype(retval, params, va_marshal=False): '''Generate a marshaller declaration with the given @visibility. If @va_marshal is True, the marshaller will use variadic arguments in place of a GValue array.''' - signature = ['G_BEGIN_DECLS'] + signature = [] if visibility == Visibility.INTERNAL: signature += ['G_GNUC_INTERNAL'] @@ -585,8 +585,6 @@ def generate_prototype(retval, params, signature += [indent('int n_params,', level=width, fill=' ')] signature += [indent('GType *param_types);', level=width, fill=' ')] - signature += ['G_END_DECLS'] - return signature @@ -822,7 +820,11 @@ def generate_marshallers_body(outfile, retval, params, else: decl_visibility = Visibility.EXTERN proto = ['/* Prototype for -Wmissing-prototypes */'] + # Add C++ guards in case somebody compiles the generated code + # with a C++ compiler + proto += ['G_BEGIN_DECLS'] proto += generate_prototype(retval, params, prefix, decl_visibility, False) + proto += ['G_END_DECLS'] outfile.write('\n'.join(proto)) outfile.write('\n') @@ -838,7 +840,10 @@ def generate_marshallers_body(outfile, retval, params, else: decl_visibility = Visibility.EXTERN proto = ['/* Prototype for -Wmissing-prototypes */'] + # Add C++ guards here as well + proto += ['G_BEGIN_DECLS'] proto += generate_prototype(retval, params, prefix, decl_visibility, True) + proto += ['G_END_DECLS'] outfile.write('\n'.join(proto)) outfile.write('\n') diff --git a/gobject/gobject.rc b/gobject/gobject.rc index 8ce241cc7..13e6dfc88 100644 --- a/gobject/gobject.rc +++ b/gobject/gobject.rc @@ -1,8 +1,8 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,53,6,0 - PRODUCTVERSION 2,53,6,0 + FILEVERSION 2,53,7,0 + PRODUCTVERSION 2,53,7,0 FILEFLAGSMASK 0 FILEFLAGS 0 FILEOS VOS__WINDOWS32 @@ -15,12 +15,12 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "The GLib developer community" VALUE "FileDescription", "GObject" - VALUE "FileVersion", "2.53.6.0" + VALUE "FileVersion", "2.53.7.0" VALUE "InternalName", "libgobject-2.0-0" VALUE "LegalCopyright", "Copyright © 1998-2011 Tim Janik, Red Hat, Inc. and others" VALUE "OriginalFilename", "libgobject-2.0-0.dll" VALUE "ProductName", "GLib" - VALUE "ProductVersion", "2.53.6" + VALUE "ProductVersion", "2.53.7" END END BLOCK "VarFileInfo" |