summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Reiter <reiter.christoph@gmail.com>2018-07-29 17:33:22 +0200
committerChristoph Reiter <reiter.christoph@gmail.com>2018-07-29 18:57:03 +0200
commit77b1ca0d89006d63db5d5ffbb2da0fb4c260b248 (patch)
treeabd2b5a79cb63ed94cedc69fbd4cb3fcaa86f8ca
parent9535fc481f28fa661fa9d48b932e089aa3504bc3 (diff)
downloadgobject-introspection-77b1ca0d89006d63db5d5ffbb2da0fb4c260b248.tar.gz
build: enable -Wredundant-decls
The ffi decls were added in cbdd9ee09e367e4dd to work around broken ffi headers. Let's assume this is fixed now.
-rw-r--r--configure.ac4
-rw-r--r--girepository/girepository-private.h9
-rw-r--r--tests/scanner/foo.c1
3 files changed, 2 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac
index af2a27d0..78e500ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,14 +65,14 @@ AX_COMPILER_FLAGS(,, [yes])
# These get triggered a lot, not worth it imo, but feel free to fix them
AX_APPEND_COMPILE_FLAGS([-Wno-duplicated-branches -Wno-switch-enum])
# FIXME: Fix the warnings and remove the flags
-AX_APPEND_COMPILE_FLAGS([-Wno-redundant-decls -Wno-deprecated-declarations])
+AX_APPEND_COMPILE_FLAGS([-Wno-deprecated-declarations])
WARN_CFLAGS_PYTHON="$WARN_CFLAGS"
AX_APPEND_COMPILE_FLAGS([-Wno-discarded-qualifiers], [WARN_CFLAGS_PYTHON])
AC_SUBST(WARN_CFLAGS_PYTHON)
WARN_CFLAGS_FLEX="$WARN_CFLAGS"
-AX_APPEND_COMPILE_FLAGS([-Wno-sign-compare -Wno-switch-default], [WARN_CFLAGS_FLEX])
+AX_APPEND_COMPILE_FLAGS([-Wno-sign-compare -Wno-switch-default -Wno-redundant-decls], [WARN_CFLAGS_FLEX])
AC_SUBST(WARN_CFLAGS_FLEX)
# Checks for libraries.
diff --git a/girepository/girepository-private.h b/girepository/girepository-private.h
index bbd34e3e..de0b04e6 100644
--- a/girepository/girepository-private.h
+++ b/girepository/girepository-private.h
@@ -113,13 +113,4 @@ GIVFuncInfo * _g_base_info_find_vfunc (GIRealInfo *rinfo,
gint n_vfuncs,
const gchar *name);
-extern ffi_status ffi_prep_closure_loc (ffi_closure *,
- ffi_cif *,
- void (*fun)(ffi_cif *, void *, void **, void *),
- void *user_data,
- void *codeloc);
-extern void *ffi_closure_alloc (size_t size, void **code);
-extern void ffi_closure_free (void *);
-
-
#endif /* __GIREPOSITORY_PRIVATE_H__ */
diff --git a/tests/scanner/foo.c b/tests/scanner/foo.c
index a574a8ef..2fc8ed9e 100644
--- a/tests/scanner/foo.c
+++ b/tests/scanner/foo.c
@@ -10,7 +10,6 @@ int regress_foo_init_argv (int argc, char **argv);
int regress_foo_init_argv_address (int *argc, char ***argv);
void regress_foo_private_function (RegressFooObject *regress_foo);
void regress_foo_test_unsigned (unsigned int uint);
-void regress_foo_interface_do_regress_foo (RegressFooInterface *self, int x);
void regress_foo_do_regress_foo (RegressFooInterface *self, int x);
int regress_foo_enum_method (RegressFooEnumType regress_foo_enum);
RegressFooHidden * regress_foo_hidden_copy (const RegressFooHidden *boxed);