diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gui/modules/dwellmouselistener.c | 3 | ||||
| -rw-r--r-- | gui/modules/keymouselistener.c | 3 |
3 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,12 @@ +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. + Tue Jan 06 11:49:29 2004 George Lebl <jirka@5z.com> * daemon/display.c, daemon/gdm.h, daemon/server.c, daemon/slave.c, 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. |