diff options
author | Murray Cumming <murrayc@murrayc.com> | 2010-06-06 14:17:03 +0200 |
---|---|---|
committer | Murray Cumming <murrayc@murrayc.com> | 2010-06-06 14:20:47 +0200 |
commit | bd4605744783c18e43c74d29a9a691d638307975 (patch) | |
tree | 3655c404f1135b89cf0185b59a41f6dc97b2fc57 /glib/src/glib_functions.defs | |
parent | ab8bbe35087e133d2c347612b6b18943675fd06e (diff) | |
download | glibmm-bd4605744783c18e43c74d29a9a691d638307975.tar.gz |
Settings: Fix the build with the latest glib from git master.
* gio/src/gio_methods.defs: Remove extra length parameters, removed from the
C API. This is a generated file, but this change is simple.
* gio/src/settings.[hg|ccg]: get_string_array(), set_string_array():
Remove the length parameter, and just use _WRAP_METHOD() now that it is simple
enough for that.
* tools/m4/convert_gio.m4: Add a necessary conversion.
* glib/src/glib_functions.defs: Remove some bad unused definitions that
were causing annoying warnings.
Diffstat (limited to 'glib/src/glib_functions.defs')
-rw-r--r-- | glib/src/glib_functions.defs | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/glib/src/glib_functions.defs b/glib/src/glib_functions.defs index 723f5302..c8ba98ce 100644 --- a/glib/src/glib_functions.defs +++ b/glib/src/glib_functions.defs @@ -9632,7 +9632,7 @@ (return-type "none") (parameters '("const-char*" "testpath") - '("void-(*" "test_func") + '("somefunc" "test_func") ) ) @@ -9642,7 +9642,7 @@ (parameters '("const-char*" "testpath") '("gconstpointer" "test_data") - '("void-(*" "test_func") + '("somefunc" "test_func") ) ) @@ -9757,7 +9757,7 @@ '("const-char*" "test_name") '("gsize" "data_size") '("gconstpointer" "test_data") - '("void-(*" "data_setup") + '("somefunc" "data_setup") ) ) @@ -9890,7 +9890,7 @@ '("const-char*" "testpath") '("gsize" "data_size") '("gconstpointer" "test_data") - '("void-(*" "data_setup") + '("somefunc" "data_setup") ) ) @@ -11266,14 +11266,6 @@ ) ) -(define-function atexit - (c-name "atexit") - (return-type "int") - (parameters - '("void" "(*") - ) -) - (define-function g_find_program_in_path (c-name "g_find_program_in_path") (return-type "gchar*") |