diff options
| author | Brian Cameron <bcameron@src.gnome.org> | 2004-01-06 21:39:28 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2004-01-06 21:39:28 +0000 |
| commit | 5f33d4645a197eb5138afb4a093295601df17b0b (patch) | |
| tree | 16404d4212bf843a2be3d6e7b4f3fbddbb2a5316 /gui/modules | |
| parent | 91dfff82dfe2fc0128a8e60d224abf0517910a6b (diff) | |
| download | gdm-5f33d4645a197eb5138afb4a093295601df17b0b.tar.gz | |
Tue Jan 06 Brian Cameron <Brian.Cameron@Sun.COM>
* gui/modules/dwellmouselistener.c,
gui/modules/keymouselistener.c: Moved include of vicious.h
before gnome.h because gnome.h causes macros to be defined
for dcgettext, dgettext, gettext, textdomain, bindtextdomain.
And this causes a conflict with Solaris libintl.h which is
included by locale.h which is included by vicious.h.
Diffstat (limited to 'gui/modules')
| -rw-r--r-- | gui/modules/dwellmouselistener.c | 3 | ||||
| -rw-r--r-- | gui/modules/keymouselistener.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/gui/modules/dwellmouselistener.c b/gui/modules/dwellmouselistener.c index 515018aa..9f066c27 100644 --- a/gui/modules/dwellmouselistener.c +++ b/gui/modules/dwellmouselistener.c @@ -27,12 +27,11 @@ #include <gmodule.h> #include <gdk/gdk.h> #include <gtk/gtk.h> +#include <vicious.h> #include <gnome.h> #include <config.h> -#include <vicious.h> - /* * Note that CONFIGFILE will have to be changed to something more generic * if this module is ever moved outside of gdm. diff --git a/gui/modules/keymouselistener.c b/gui/modules/keymouselistener.c index 0ccdbf9c..c0129e03 100644 --- a/gui/modules/keymouselistener.c +++ b/gui/modules/keymouselistener.c @@ -33,12 +33,11 @@ #include <gdk/gdk.h> #include <gdk/gdkx.h> #include <gtk/gtk.h> +#include <vicious.h> #include <gnome.h> #include <config.h> -#include <vicious.h> - /* * Note that CONFIGFILE will have to be changed to something more generic * if this module is ever moved outside of gdm. |