diff options
| author | Mariano Suárez-Alvarez <mariano@gnome.org> | 2004-08-05 18:22:50 +0000 |
|---|---|---|
| committer | Mariano Suárez-Alvarez <mariano@src.gnome.org> | 2004-08-05 18:22:50 +0000 |
| commit | 7f0e26bca118e10b295e1406f6ac0b0bc4d3fa6e (patch) | |
| tree | 044cbd3da770e693c5e4909f99a0aa62381002fc | |
| parent | bc82d639b8a03fecf42ae42a6f8397fc9b7ac175 (diff) | |
| download | gnome-desktop-gnome-2-6.tar.gz | |
move the declaration of environ out of a preprocessor conditional block.gnome-2-6
2004-08-05 Mariano Suárez-Alvarez <mariano@gnome.org>
* gnome-desktop-item.c: move the declaration of environ out of a
preprocessor conditional block. Fixes bug #149340.
| -rw-r--r-- | libgnome-desktop/ChangeLog | 5 | ||||
| -rw-r--r-- | libgnome-desktop/gnome-desktop-item.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libgnome-desktop/ChangeLog b/libgnome-desktop/ChangeLog index 091d81e2..f5cae3fc 100644 --- a/libgnome-desktop/ChangeLog +++ b/libgnome-desktop/ChangeLog @@ -1,3 +1,8 @@ +2004-08-05 Mariano Suárez-Alvarez <mariano@gnome.org> + + * gnome-desktop-item.c: move the declaration of environ out of a + preprocessor conditional block. Fixes bug #149340. + 2004-08-04 Vincent Untz <vincent@vuntz.net> * gnome-desktop-item.c: (gnome_desktop_item_set_strings): the last diff --git a/libgnome-desktop/gnome-desktop-item.c b/libgnome-desktop/gnome-desktop-item.c index db2480f3..8405a54f 100644 --- a/libgnome-desktop/gnome-desktop-item.c +++ b/libgnome-desktop/gnome-desktop-item.c @@ -63,6 +63,8 @@ #define sure_string(s) ((s)!=NULL?(s):"") +extern char **environ; + struct _GnomeDesktopItem { int refcount; @@ -1396,8 +1398,6 @@ sn_error_trap_pop (SnDisplay *display, gdk_error_trap_pop (); } -extern char **environ; - static char ** make_spawn_environment_for_sn_context (SnLauncherContext *sn_context, char **envp) |