diff options
author | Marcin Kolny <marcin.kolny@gmail.com> | 2015-08-08 14:45:12 +0200 |
---|---|---|
committer | Marcin Kolny <marcin.kolny@gmail.com> | 2015-08-08 14:45:59 +0200 |
commit | 0d5f63b18f5766760cf39e82ee11482984e0a938 (patch) | |
tree | e3f74b9b37e7618c92840024077dff43e6d08f0d /glib/src/glib_functions.defs.patch | |
parent | dce7a844e48a582e42eb2b60eef5c1f2527540ac (diff) | |
parent | d94115843f38967b5e883f5f7d8057882ae364cb (diff) | |
download | glibmm-0d5f63b18f5766760cf39e82ee11482984e0a938.tar.gz |
Merge branch 'master' into glibmm-gir-gmmprocglibmm-gir-gmmproc
Diffstat (limited to 'glib/src/glib_functions.defs.patch')
-rw-r--r-- | glib/src/glib_functions.defs.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/glib/src/glib_functions.defs.patch b/glib/src/glib_functions.defs.patch index b36c05a6..c0437518 100644 --- a/glib/src/glib_functions.defs.patch +++ b/glib/src/glib_functions.defs.patch @@ -1,6 +1,6 @@ ---- glib_functions.defs 2012-02-28 10:09:30.000000000 -0500 -+++ glib_functions.defs.new 2012-02-28 10:08:25.000000000 -0500 -@@ -2563,7 +2563,7 @@ +--- glib_functions.defs.orig 2015-02-15 16:49:21.605101660 +0100 ++++ glib_functions.defs 2015-02-15 16:49:21.617101670 +0100 +@@ -2739,7 +2739,7 @@ ) ) @@ -9,7 +9,7 @@ (of-object "GIConv") (c-name "g_iconv") (return-type "gsize") -@@ -12346,13 +12346,9 @@ +@@ -13320,13 +13320,9 @@ (return-type "const-gchar*-const*") ) @@ -24,9 +24,9 @@ +;; has a function pointer parameter and that is not handled correctly by +;; h2def.py. - (define-function g_get_user_runtime_dir - (c-name "g_get_user_runtime_dir") -@@ -12440,13 +12436,8 @@ + (define-function g_get_system_config_dirs + (c-name "g_get_system_config_dirs") +@@ -13419,13 +13415,8 @@ ) ) |