diff options
| author | Guy Harris <guy@alum.mit.edu> | 2000-04-06 06:52:10 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2000-04-06 06:52:10 +0000 |
| commit | 1a460aa45390c9fa92252f7ab2c63281824f1f34 (patch) | |
| tree | 70e4e8b642ef29b198c96aa82bfa36b524146577 | |
| parent | 9e8cab115d775abbd0c6a49214aed984c9537381 (diff) | |
| download | wireshark-1a460aa45390c9fa92252f7ab2c63281824f1f34.tar.gz wireshark-1a460aa45390c9fa92252f7ab2c63281824f1f34.tar.bz2 wireshark-1a460aa45390c9fa92252f7ab2c63281824f1f34.zip | |
Define "popup_menu_object" only in "gtk/menu.c", and just declare it as
an "extern" in "gtk/menu.h", to avoid complaints from the linker on some
platforms.
svn path=/trunk/; revision=1810
| -rw-r--r-- | gtk/menu.c | 4 | ||||
| -rw-r--r-- | gtk/menu.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/gtk/menu.c b/gtk/menu.c index 699597246d..b1836451b6 100644 --- a/gtk/menu.c +++ b/gtk/menu.c @@ -1,7 +1,7 @@ /* menu.c * Menu routines * - * $Id: menu.c,v 1.27 2000/03/29 22:39:19 guy Exp $ + * $Id: menu.c,v 1.28 2000/04/06 06:52:09 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -57,6 +57,8 @@ #include "keys.h" #include "plugins.h" +GtkWidget *popup_menu_object; + #define GTK_MENU_FUNC(a) ((GtkItemFactoryCallback)(a)) static void menus_init(void); diff --git a/gtk/menu.h b/gtk/menu.h index 3890ba773d..70eb2666b7 100644 --- a/gtk/menu.h +++ b/gtk/menu.h @@ -1,7 +1,7 @@ /* menu.h * Menu definitions * - * $Id: menu.h,v 1.4 2000/01/18 08:38:18 guy Exp $ + * $Id: menu.h,v 1.5 2000/04/06 06:52:10 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -34,7 +34,7 @@ void get_main_menu (GtkWidget **, GtkAccelGroup **); void set_menu_object_data (gchar *path, gchar *key, gpointer data); void popup_menu_handler(GtkWidget *widget, GdkEvent *event); -GtkWidget *popup_menu_object; +extern GtkWidget *popup_menu_object; #ifdef __cplusplus } |