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/ChangeLog b/lib/ChangeLog
index 18ac2214df4bbe5bb6b4aabe8c8c1f7ec0b963ba..5a0eff55cd4242a1aad849c8ef127e3ce6d8a097 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,12 @@
+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
+       
 2005-05-07 Yar Tikhiy <yar@comp.chem.msu.su>
 
        * sockopt.c: Add support for BSD style ifindex in ip_mreq.

diff --git a/lib/getopt.c b/lib/getopt.c
index 426b29bf76a7b66eb9b74ed5799a57f63897b8f2..329e93951f9d4d66e68d42c30c0f668cdd6c8460 100644 (file)
--- 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)'.  */

diff --git a/lib/getopt.h b/lib/getopt.h
index c4519b7f4733bd4abe5c107113e66acdfa2d6352..68a9acfbefe51595dfc65717692c324a6878a6d1 100644 (file)
--- a/lib/getopt.h
+++ b/lib/getopt.h
@@ -99,12 +99,12 @@ struct option
 #define optional_argument      2
 
 #if defined (__STDC__) && __STDC__
-#ifdef __GNU_LIBRARY__
+#if defined (__GNU_LIBRARY__) || defined (__EXTENSIONS__)
 /* Many other libraries have conflicting prototypes for getopt, with
    differences in the consts, in stdlib.h.  To avoid compilation
    errors, only prototype getopt for the GNU C library.  */
 extern int getopt (int argc, char *const *argv, const char *shortopts);
-#else /* not __GNU_LIBRARY__ */
+#else /* not __GNU_LIBRARY__ or __EXTENSIONS__ */
 extern int getopt (void);
 #endif /* __GNU_LIBRARY__ */
 extern int getopt_long (int argc, char *const *argv, const char *shortopts,

diff --git a/lib/getopt1.c b/lib/getopt1.c
index ff257374c335af5847a1a611e1e2cda2ff3caaca..985f12c585f27e4b7cbedf0f81009c7c940663c6 100644 (file)
--- a/lib/getopt1.c
+++ b/lib/getopt1.c
@@ -24,6 +24,7 @@
 #include <config.h>
 #endif
 
+#include <zebra.h>
 #include "getopt.h"
 
 #if !defined __STDC__ || !__STDC__