* gtkedit.c: Include <sys/param.h> if present - it should always

be included before <glib.h> to avoid redefining MIN and MAX.
* editcmd.c [!MIDNIGHT]: Undefine B_ENTER and B_CANCEL before
redefining them.

gtkedit/ChangeLog

@@ -1,5 +1,10 @@
 2001-08-19  Pavel Roskin  <proski@gnu.org>
 
+	* gtkedit.c: Include <sys/param.h> if present - it should always
+	be included before <glib.h> to avoid redefining MIN and MAX.
+	* editcmd.c [!MIDNIGHT]: Undefine B_ENTER and B_CANCEL before
+	redefining them.
+
 	* edit.h: Include <sys/param.h> if present.  Include Gtk+
 	headers as system headers.
 	* gtkedit.c: Include Gtk+ headers as system headers.

gtkedit/editcmd.c

@@ -1424,6 +1424,9 @@ void edit_search_dialog (WEdit * edit, char **search_text)
 
 #else
 
+#undef B_ENTER
+#undef B_CANCEL
+
 #define B_ENTER 0
 #define B_SKIP_REPLACE 1
 #define B_REPLACE_ALL 2

gtkedit/gtkedit.c

@@ -22,10 +22,15 @@
 #define _GTK_EDIT_C
 
 #include <config.h>
-#include <gnome.h>
 #include <ctype.h>
 #include <string.h>
 #include <pwd.h>
+
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+
+#include <gnome.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkselection.h>