From: Darin Adler Date: Wed, 11 Jul 2001 20:08:50 +0000 (+0000) Subject: Add some generated files. X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=624a3c9689a9538af7df04aab389423edc82b51a;p=dana%2Fcg-glib.git Add some generated files. * .cvsignore: Add some generated files. * glib/gmain.c: (g_main_context_iterate): Comment out cruft after #endif to avoid gcc warning. * gmodule/gmodule.c: (g_module_set_error_unduped): Remove const from type to avoid gcc warning. * gobject/gsignal.c: (g_signal_emitv): ifdef variable used only if G_ENABLE_DEBUG to avoid gcc warning. * gobject/gtype.c: (type_iface_vtable_init_Wm), (type_iface_vtable_finalize_Wm): ifdef call needed only if !G_DISABLE_ASSERT to avoid gcc warning. * tests/testglib.c: (main): ifdef call needed only if !G_DISABLE_ASSERT to avoid gcc warning. Maybe later we should make the test to #undef G_DISABLE_ASSERT. * tests/unicode-collate.c: Add include of to avoid gcc warning. --- diff --git a/.cvsignore b/.cvsignore index fd945085..54173bd9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -36,3 +36,4 @@ gthread-2.0-uninstalled.pc gobject-2.0-uninstalled.pc glib-config-2.0 .saved +sgml diff --git a/ChangeLog b/ChangeLog index 53309157..38d32066 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2001-07-11 Darin Adler + + * .cvsignore: Add some generated files. + + * glib/gmain.c: (g_main_context_iterate): Comment out cruft + after #endif to avoid gcc warning. + * gmodule/gmodule.c: (g_module_set_error_unduped): Remove + const from type to avoid gcc warning. + * gobject/gsignal.c: (g_signal_emitv): ifdef variable used + only if G_ENABLE_DEBUG to avoid gcc warning. + * gobject/gtype.c: (type_iface_vtable_init_Wm), + (type_iface_vtable_finalize_Wm): ifdef call needed only + if !G_DISABLE_ASSERT to avoid gcc warning. + * tests/testglib.c: (main): ifdef call needed only if + !G_DISABLE_ASSERT to avoid gcc warning. Maybe later we + should make the test to #undef G_DISABLE_ASSERT. + * tests/unicode-collate.c: Add include of to + avoid gcc warning. + Wed Jul 11 11:13:50 2001 Owen Taylor * glib/Makefile.am (libglib_1_3_la_SOURCES): Add gunicomp.h diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 53309157..38d32066 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,22 @@ +2001-07-11 Darin Adler + + * .cvsignore: Add some generated files. + + * glib/gmain.c: (g_main_context_iterate): Comment out cruft + after #endif to avoid gcc warning. + * gmodule/gmodule.c: (g_module_set_error_unduped): Remove + const from type to avoid gcc warning. + * gobject/gsignal.c: (g_signal_emitv): ifdef variable used + only if G_ENABLE_DEBUG to avoid gcc warning. + * gobject/gtype.c: (type_iface_vtable_init_Wm), + (type_iface_vtable_finalize_Wm): ifdef call needed only + if !G_DISABLE_ASSERT to avoid gcc warning. + * tests/testglib.c: (main): ifdef call needed only if + !G_DISABLE_ASSERT to avoid gcc warning. Maybe later we + should make the test to #undef G_DISABLE_ASSERT. + * tests/unicode-collate.c: Add include of to + avoid gcc warning. + Wed Jul 11 11:13:50 2001 Owen Taylor * glib/Makefile.am (libglib_1_3_la_SOURCES): Add gunicomp.h diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 53309157..38d32066 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,22 @@ +2001-07-11 Darin Adler + + * .cvsignore: Add some generated files. + + * glib/gmain.c: (g_main_context_iterate): Comment out cruft + after #endif to avoid gcc warning. + * gmodule/gmodule.c: (g_module_set_error_unduped): Remove + const from type to avoid gcc warning. + * gobject/gsignal.c: (g_signal_emitv): ifdef variable used + only if G_ENABLE_DEBUG to avoid gcc warning. + * gobject/gtype.c: (type_iface_vtable_init_Wm), + (type_iface_vtable_finalize_Wm): ifdef call needed only + if !G_DISABLE_ASSERT to avoid gcc warning. + * tests/testglib.c: (main): ifdef call needed only if + !G_DISABLE_ASSERT to avoid gcc warning. Maybe later we + should make the test to #undef G_DISABLE_ASSERT. + * tests/unicode-collate.c: Add include of to + avoid gcc warning. + Wed Jul 11 11:13:50 2001 Owen Taylor * glib/Makefile.am (libglib_1_3_la_SOURCES): Add gunicomp.h diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 53309157..38d32066 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,22 @@ +2001-07-11 Darin Adler + + * .cvsignore: Add some generated files. + + * glib/gmain.c: (g_main_context_iterate): Comment out cruft + after #endif to avoid gcc warning. + * gmodule/gmodule.c: (g_module_set_error_unduped): Remove + const from type to avoid gcc warning. + * gobject/gsignal.c: (g_signal_emitv): ifdef variable used + only if G_ENABLE_DEBUG to avoid gcc warning. + * gobject/gtype.c: (type_iface_vtable_init_Wm), + (type_iface_vtable_finalize_Wm): ifdef call needed only + if !G_DISABLE_ASSERT to avoid gcc warning. + * tests/testglib.c: (main): ifdef call needed only if + !G_DISABLE_ASSERT to avoid gcc warning. Maybe later we + should make the test to #undef G_DISABLE_ASSERT. + * tests/unicode-collate.c: Add include of to + avoid gcc warning. + Wed Jul 11 11:13:50 2001 Owen Taylor * glib/Makefile.am (libglib_1_3_la_SOURCES): Add gunicomp.h diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 53309157..38d32066 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,22 @@ +2001-07-11 Darin Adler + + * .cvsignore: Add some generated files. + + * glib/gmain.c: (g_main_context_iterate): Comment out cruft + after #endif to avoid gcc warning. + * gmodule/gmodule.c: (g_module_set_error_unduped): Remove + const from type to avoid gcc warning. + * gobject/gsignal.c: (g_signal_emitv): ifdef variable used + only if G_ENABLE_DEBUG to avoid gcc warning. + * gobject/gtype.c: (type_iface_vtable_init_Wm), + (type_iface_vtable_finalize_Wm): ifdef call needed only + if !G_DISABLE_ASSERT to avoid gcc warning. + * tests/testglib.c: (main): ifdef call needed only if + !G_DISABLE_ASSERT to avoid gcc warning. Maybe later we + should make the test to #undef G_DISABLE_ASSERT. + * tests/unicode-collate.c: Add include of to + avoid gcc warning. + Wed Jul 11 11:13:50 2001 Owen Taylor * glib/Makefile.am (libglib_1_3_la_SOURCES): Add gunicomp.h diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 53309157..38d32066 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,22 @@ +2001-07-11 Darin Adler + + * .cvsignore: Add some generated files. + + * glib/gmain.c: (g_main_context_iterate): Comment out cruft + after #endif to avoid gcc warning. + * gmodule/gmodule.c: (g_module_set_error_unduped): Remove + const from type to avoid gcc warning. + * gobject/gsignal.c: (g_signal_emitv): ifdef variable used + only if G_ENABLE_DEBUG to avoid gcc warning. + * gobject/gtype.c: (type_iface_vtable_init_Wm), + (type_iface_vtable_finalize_Wm): ifdef call needed only + if !G_DISABLE_ASSERT to avoid gcc warning. + * tests/testglib.c: (main): ifdef call needed only if + !G_DISABLE_ASSERT to avoid gcc warning. Maybe later we + should make the test to #undef G_DISABLE_ASSERT. + * tests/unicode-collate.c: Add include of to + avoid gcc warning. + Wed Jul 11 11:13:50 2001 Owen Taylor * glib/Makefile.am (libglib_1_3_la_SOURCES): Add gunicomp.h diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 53309157..38d32066 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,22 @@ +2001-07-11 Darin Adler + + * .cvsignore: Add some generated files. + + * glib/gmain.c: (g_main_context_iterate): Comment out cruft + after #endif to avoid gcc warning. + * gmodule/gmodule.c: (g_module_set_error_unduped): Remove + const from type to avoid gcc warning. + * gobject/gsignal.c: (g_signal_emitv): ifdef variable used + only if G_ENABLE_DEBUG to avoid gcc warning. + * gobject/gtype.c: (type_iface_vtable_init_Wm), + (type_iface_vtable_finalize_Wm): ifdef call needed only + if !G_DISABLE_ASSERT to avoid gcc warning. + * tests/testglib.c: (main): ifdef call needed only if + !G_DISABLE_ASSERT to avoid gcc warning. Maybe later we + should make the test to #undef G_DISABLE_ASSERT. + * tests/unicode-collate.c: Add include of to + avoid gcc warning. + Wed Jul 11 11:13:50 2001 Owen Taylor * glib/Makefile.am (libglib_1_3_la_SOURCES): Add gunicomp.h diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 53309157..38d32066 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,22 @@ +2001-07-11 Darin Adler + + * .cvsignore: Add some generated files. + + * glib/gmain.c: (g_main_context_iterate): Comment out cruft + after #endif to avoid gcc warning. + * gmodule/gmodule.c: (g_module_set_error_unduped): Remove + const from type to avoid gcc warning. + * gobject/gsignal.c: (g_signal_emitv): ifdef variable used + only if G_ENABLE_DEBUG to avoid gcc warning. + * gobject/gtype.c: (type_iface_vtable_init_Wm), + (type_iface_vtable_finalize_Wm): ifdef call needed only + if !G_DISABLE_ASSERT to avoid gcc warning. + * tests/testglib.c: (main): ifdef call needed only if + !G_DISABLE_ASSERT to avoid gcc warning. Maybe later we + should make the test to #undef G_DISABLE_ASSERT. + * tests/unicode-collate.c: Add include of to + avoid gcc warning. + Wed Jul 11 11:13:50 2001 Owen Taylor * glib/Makefile.am (libglib_1_3_la_SOURCES): Add gunicomp.h diff --git a/glib/gmain.c b/glib/gmain.c index 7c3add6f..34c95207 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -2174,7 +2174,7 @@ g_main_context_iterate (GMainContext *context, } else LOCK_CONTEXT (context); -#endif G_THREADS_ENABLED +#endif /* G_THREADS_ENABLED */ if (!context->cached_poll_array) { diff --git a/gmodule/gmodule.c b/gmodule/gmodule.c index bb6fbc7b..a6b179a0 100644 --- a/gmodule/gmodule.c +++ b/gmodule/gmodule.c @@ -124,7 +124,7 @@ g_module_find_by_name (const gchar *name) } static inline void -g_module_set_error_unduped (const gchar *error) +g_module_set_error_unduped (gchar *error) { g_static_private_set (&module_error_private, error, g_free); errno = 0; diff --git a/gobject/gsignal.c b/gobject/gsignal.c index 4927abf0..1e3688e9 100644 --- a/gobject/gsignal.c +++ b/gobject/gsignal.c @@ -1736,7 +1736,9 @@ g_signal_emitv (const GValue *instance_and_params, const GValue *param_values; gpointer instance; SignalNode *node; +#ifdef G_ENABLE_DEBUG guint i; +#endif g_return_if_fail (instance_and_params != NULL); instance = g_value_peek_pointer (instance_and_params); diff --git a/gobject/gtype.c b/gobject/gtype.c index e13330f8..8530c766 100644 --- a/gobject/gtype.c +++ b/gobject/gtype.c @@ -1391,7 +1391,9 @@ static void type_iface_vtable_init_Wm (TypeNode *iface, TypeNode *node) { +#ifndef G_DISABLE_ASSERT IFaceEntry *entry = type_lookup_iface_entry_L (node, iface); +#endif IFaceHolder *iholder = type_iface_retrive_holder_info_Wm (iface, NODE_TYPE (node)); GTypeInterface *vtable; @@ -1418,7 +1420,9 @@ type_iface_vtable_finalize_Wm (TypeNode *iface, TypeNode *node, GTypeInterface *vtable) { +#ifndef G_DISABLE_ASSERT IFaceEntry *entry = type_lookup_iface_entry_L (node, iface); +#endif IFaceHolder *iholder = iface_node_get_holders_L (iface); g_assert (entry && entry->vtable == vtable); diff --git a/tests/testglib.c b/tests/testglib.c index 541849ec..bc25d412 100644 --- a/tests/testglib.c +++ b/tests/testglib.c @@ -385,11 +385,13 @@ main (int argc, }; guint n_skip_root_checks = G_N_ELEMENTS (skip_root_checks); +#ifndef G_DISABLE_ASSERT guint16 gu16t1 = 0x44afU, gu16t2 = 0xaf44U; guint32 gu32t1 = 0x02a7f109U, gu32t2 = 0x09f1a702U; #ifdef G_HAVE_GINT64 guint64 gu64t1 = G_GINT64_CONSTANT(0x1d636b02300a7aa7U), gu64t2 = G_GINT64_CONSTANT(0xa77a0a30026b631dU); +#endif #endif const char hello[] = "Hello, World"; const int hellolen = sizeof (hello) - 1; diff --git a/tests/unicode-collate.c b/tests/unicode-collate.c index 5475c89b..75d3f597 100644 --- a/tests/unicode-collate.c +++ b/tests/unicode-collate.c @@ -1,6 +1,7 @@ #include #include #include +#include typedef struct { const char *key;