X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetopt.c;h=c7fbc2d8013c5fe63bc51827a67215c402384a5a;hb=cba9751a5c129f78d162fbe541a2f50ea1753e93;hp=654f7615989466bdb925378ee578dea608f9bd56;hpb=3f76a0ec171a9cb09e9d371482cf7eb7ff9627a6;p=gnulib.git

diff --git a/lib/getopt.c b/lib/getopt.c
index 654f76159..c7fbc2d80 100644
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -60,7 +60,7 @@
 
 /* This needs to come after some library #include
    to get __GNU_LIBRARY__ defined.  */
-#ifdef	__GNU_LIBRARY__
+#if defined (__GNU_LIBRARY__) || defined (__sgi)
 /* Don't include stdlib.h for non-GNU C libraries because some of them
    contain conflicting prototypes for getopt.  */
 #include <stdlib.h>
@@ -159,7 +159,7 @@ static enum
   REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
 } ordering;
 
-#ifdef	__GNU_LIBRARY__
+#if defined (__GNU_LIBRARY__) || defined (__sgi)
 /* We want to avoid inclusion of string.h with non-GNU libraries
    because there are many ways it can cause trouble.
    On some systems, it contains special magic macros that don't work
@@ -480,6 +480,10 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
       for (nameend = nextchar; *nameend && *nameend != '='; nameend++)
 	/* Do nothing.  */ ;
 
+#ifdef lint		/* Suppress `used before initialized' warning.  */
+      indfound = 0;
+#endif
+
       /* Test all long options for either exact match
 	 or abbreviated matches.  */
       for (p = longopts, option_index = 0; p->name; p++, option_index++)