2005-05-15 Paul Jakma <paul@dishone.st>

	* getopt.h: It's not just __GNU_LIBRARY__ which defines
	  getopt, eg __EXTENSIONS__ does too on SunOS. It still seems
	  awfully fragile though.
	* getopt.c: include zebra.h after config.h, before including
	  getopt.h so that things at least are consistent..
	* getopt1.c: ditto
diff --git a/lib/getopt.c b/lib/getopt.c
index 426b29b..329e939 100644
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -34,6 +34,8 @@
 # include <config.h>
 #endif
 
+#include <zebra.h>
+
 #if !defined __STDC__ || !__STDC__
 /* This is a separate conditional since some stdc systems
    reject `defined (const)'.  */