debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Define kalistglobal only once, declare it globally

Browse source 
This fixes building with gcc and the -fno-common option. The
option is now added to compiler flags in full debugging mode.
This commit is contained in:
Enrico Tröger 2010-09-25 12:42:51 +02:00 committed by Christian Dywan
parent 430e754ae0
commit 769a1dce17
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
katze/katze-array.c
View file

@ -65,6 +65,8 @@ enum {
static guint signals[LAST_SIGNAL]; static guint signals[LAST_SIGNAL];
GList* kalistglobal;
static void static void
katze_array_finalize (GObject* object); katze_array_finalize (GObject* object);

2
katze/katze-array.h
View file

@ -83,7 +83,7 @@ katze_array_get_items (KatzeArray* array);
GList* GList*
katze_array_peek_items (KatzeArray* array); katze_array_peek_items (KatzeArray* array);
GList* kalistglobal; extern GList* kalistglobal;
#define KATZE_ARRAY_FOREACH_ITEM(kaitem, kaarray) \ #define KATZE_ARRAY_FOREACH_ITEM(kaitem, kaarray) \
for (kalistglobal = katze_array_peek_items (kaarray), \ for (kalistglobal = katze_array_peek_items (kaarray), \
kaitem = kalistglobal ? kalistglobal->data : NULL; \ kaitem = kalistglobal ? kalistglobal->data : NULL; \

2
wscript
View file

@ -308,7 +308,7 @@ def configure (conf):
'-Wno-missing-field-initializers ' '-Wno-missing-field-initializers '
'-Wredundant-decls -Wmissing-noreturn ' '-Wredundant-decls -Wmissing-noreturn '
'-Wshadow -Wpointer-arith -Wcast-align ' '-Wshadow -Wpointer-arith -Wcast-align '
'-Winline -Wformat-security ' '-Winline -Wformat-security -fno-common '
'-Winit-self -Wundef -Wdeclaration-after-statement ' '-Winit-self -Wundef -Wdeclaration-after-statement '
'-Wmissing-format-attribute -Wnested-externs ' '-Wmissing-format-attribute -Wnested-externs '
# -DGSEAL_ENABLE # -DGSEAL_ENABLE