[Xfce4-commits] <midori:master> Define kalistglobal only once, declare it globally

[Christian Dywan]

Updating branch refs/heads/master
         to 769a1dce179fbcdcdae3328ef8d4b969e3113668 (commit)
       from 430e754ae033287437e1e6fbfe9af6f3dfac05dd (commit)

commit 769a1dce179fbcdcdae3328ef8d4b969e3113668
Author: Enrico Tröger <enrico.troeger at uvena.de>
Date:   Sat Sep 25 12:42:51 2010 +0200

    Define kalistglobal only once, declare it globally
    
    This fixes building with gcc and the -fno-common option. The
    option is now added to compiler flags in full debugging mode.

 katze/katze-array.c |    2 ++
 katze/katze-array.h |    2 +-
 wscript             |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/katze/katze-array.c b/katze/katze-array.c
index 2c46c95..fb177c7 100644
--- a/katze/katze-array.c
+++ b/katze/katze-array.c
@@ -65,6 +65,8 @@ enum {
 
 static guint signals[LAST_SIGNAL];
 
+GList* kalistglobal;
+
 static void
 katze_array_finalize (GObject* object);
 
diff --git a/katze/katze-array.h b/katze/katze-array.h
index f54f66b..c4d45d5 100644
--- a/katze/katze-array.h
+++ b/katze/katze-array.h
@@ -83,7 +83,7 @@ katze_array_get_items              (KatzeArray*   array);
 GList*
 katze_array_peek_items             (KatzeArray*   array);
 
-GList* kalistglobal;
+extern GList* kalistglobal;
 #define KATZE_ARRAY_FOREACH_ITEM(kaitem, kaarray) \
     for (kalistglobal = katze_array_peek_items (kaarray), \
          kaitem = kalistglobal ? kalistglobal->data : NULL; \
diff --git a/wscript b/wscript
index da389ef..0ffd436 100644
--- a/wscript
+++ b/wscript
@@ -308,7 +308,7 @@ def configure (conf):
                 '-Wno-missing-field-initializers '
                 '-Wredundant-decls -Wmissing-noreturn '
                 '-Wshadow -Wpointer-arith -Wcast-align '
-                '-Winline -Wformat-security '
+                '-Winline -Wformat-security -fno-common '
                 '-Winit-self -Wundef -Wdeclaration-after-statement '
                 '-Wmissing-format-attribute -Wnested-externs '
             # -DGSEAL_ENABLE