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 <string.h> to
        avoid gcc warning.

diff --git a/.cvsignore b/.cvsignore
index fd945085b1e77ce4bb4521e8cfcf9bd2780a4842..54173bd9de6305c420f36d4a326267e208fea41f 100644 (file)
--- 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 53309157d0fe6458168c559a2bedbe9fdb766f55..38d32066919db04ad6a3582156690dfec46ef5ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2001-07-11  Darin Adler  <darin@bentspoon.com>
+
+       * .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 <string.h> to
+       avoid gcc warning.
+
 Wed Jul 11 11:13:50 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/Makefile.am (libglib_1_3_la_SOURCES): Add gunicomp.h

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 53309157d0fe6458168c559a2bedbe9fdb766f55..38d32066919db04ad6a3582156690dfec46ef5ad 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,22 @@
+2001-07-11  Darin Adler  <darin@bentspoon.com>
+
+       * .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 <string.h> to
+       avoid gcc warning.
+
 Wed Jul 11 11:13:50 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/Makefile.am (libglib_1_3_la_SOURCES): Add gunicomp.h

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 53309157d0fe6458168c559a2bedbe9fdb766f55..38d32066919db04ad6a3582156690dfec46ef5ad 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,22 @@
+2001-07-11  Darin Adler  <darin@bentspoon.com>
+
+       * .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 <string.h> to
+       avoid gcc warning.
+
 Wed Jul 11 11:13:50 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/Makefile.am (libglib_1_3_la_SOURCES): Add gunicomp.h

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 53309157d0fe6458168c559a2bedbe9fdb766f55..38d32066919db04ad6a3582156690dfec46ef5ad 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,22 @@
+2001-07-11  Darin Adler  <darin@bentspoon.com>
+
+       * .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 <string.h> to
+       avoid gcc warning.
+
 Wed Jul 11 11:13:50 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/Makefile.am (libglib_1_3_la_SOURCES): Add gunicomp.h

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 53309157d0fe6458168c559a2bedbe9fdb766f55..38d32066919db04ad6a3582156690dfec46ef5ad 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,22 @@
+2001-07-11  Darin Adler  <darin@bentspoon.com>
+
+       * .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 <string.h> to
+       avoid gcc warning.
+
 Wed Jul 11 11:13:50 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/Makefile.am (libglib_1_3_la_SOURCES): Add gunicomp.h

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 53309157d0fe6458168c559a2bedbe9fdb766f55..38d32066919db04ad6a3582156690dfec46ef5ad 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,22 @@
+2001-07-11  Darin Adler  <darin@bentspoon.com>
+
+       * .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 <string.h> to
+       avoid gcc warning.
+
 Wed Jul 11 11:13:50 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/Makefile.am (libglib_1_3_la_SOURCES): Add gunicomp.h

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 53309157d0fe6458168c559a2bedbe9fdb766f55..38d32066919db04ad6a3582156690dfec46ef5ad 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,22 @@
+2001-07-11  Darin Adler  <darin@bentspoon.com>
+
+       * .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 <string.h> to
+       avoid gcc warning.
+
 Wed Jul 11 11:13:50 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/Makefile.am (libglib_1_3_la_SOURCES): Add gunicomp.h

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 53309157d0fe6458168c559a2bedbe9fdb766f55..38d32066919db04ad6a3582156690dfec46ef5ad 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,22 @@
+2001-07-11  Darin Adler  <darin@bentspoon.com>
+
+       * .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 <string.h> to
+       avoid gcc warning.
+
 Wed Jul 11 11:13:50 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/Makefile.am (libglib_1_3_la_SOURCES): Add gunicomp.h

diff --git a/glib/gmain.c b/glib/gmain.c
index 7c3add6f026c2705aa1b8a5445dd82e61848d9dc..34c95207d59dc546e3633b653d7ce72043a5649f 100644 (file)
--- 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 bb6fbc7b76232476a8fcaf39dd2db972218df32a..a6b179a027257cdd7dd4f46ad883603a7604817e 100644 (file)
--- 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 4927abf0b6e2e3bec25c68ffb46aeb99bda4d7e9..1e3688e95252bb4958ac76503109db85f11ca737 100644 (file)
--- 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 e13330f85ceccc4b803f8c702617771c1f6b0ed1..8530c766a400123fc22de83d961bb9ef6e3b8913 100644 (file)
--- 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 541849ec3567a1d98d2f3364a6b469856faf78fb..bc25d41225b43050ec7dcac89d55e51ebd42472b 100644 (file)
--- 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 5475c89b83940c1d5156d77d8a2e2bebac20a56b..75d3f597288af8cf3e60999e1078e7f9c161e17b 100644 (file)
--- a/tests/unicode-collate.c
+++ b/tests/unicode-collate.c
@@ -1,6 +1,7 @@
 #include <glib.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 typedef struct {
   const char *key;