A little shuffling of include files is needed to avoid glib's erroneous definition of NULL: Index: nsGtkEventHandler.cpp =================================================================== RCS file: /cvsroot/mozilla/widget/src/gtk/nsGtkEventHandler.cpp,v retrieving revision 1.112.2.5 diff -u -r1.112.2.5 nsGtkEventHandler.cpp --- nsGtkEventHandler.cpp 1999/11/09 23:05:40 1.112.2.5 +++ nsGtkEventHandler.cpp 1999/11/12 18:02:29 @@ -20,9 +20,6 @@ * Contributor(s): */ -#include "gtk/gtk.h" -#include "nsGtkEventHandler.h" - #include "nsWidget.h" #include "nsWindow.h" @@ -42,6 +39,9 @@ #include "stdio.h" #include "ctype.h" + +#include "gtk/gtk.h" +#include "nsGtkEventHandler.h" #include <gdk/gdkkeysyms.h> #include <X11/Xlib.h> Index: nsWindow.cpp =================================================================== RCS file: /cvsroot/mozilla/widget/src/gtk/nsWindow.cpp,v retrieving revision 1.187.2.26 diff -u -r1.187.2.26 nsWindow.cpp --- nsWindow.cpp 1999/11/10 21:29:44 1.187.2.26 +++ nsWindow.cpp 1999/11/12 18:02:30 @@ -20,6 +20,8 @@ * Contributor(s): */ +#include "stdio.h" + #include <gtk/gtk.h> #include <gdk/gdkx.h> @@ -44,8 +46,6 @@ #include "nsIRollupListener.h" #include "nsGtkUtils.h" // for nsGtkUtils::gdk_window_flash() - -#include "stdio.h" // this is the nsWindow with the focus nsWindow *nsWindow::focusWindow = NULL;

Looks good to me. Checked in. Thanks!

code level fix, marking VERIFIED

Please ignore the spam. Changing address.

bustage from my reassign

bustage from my reassign