X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fgetopt.in.h;h=7377f3cfbd8fd5443ad9e854fd30129acbe01d52;hb=d93391bffb3c76c651161b5b8c199c358bc6256a;hp=9de467ae98cbc76fb3c6449e4a5669ae303c721b;hpb=40c7699e05fa420358703794383caf38de1713fc;p=gnulib.git

diff --git a/lib/getopt.in.h b/lib/getopt.in.h
index 9de467ae9..7377f3cfb 100644
--- a/lib/getopt.in.h
+++ b/lib/getopt.in.h
@@ -22,9 +22,13 @@
 @PRAGMA_SYSTEM_HEADER@
 #endif
 
-/* The include_next requires a split double-inclusion guard.  */
+/* The include_next requires a split double-inclusion guard.  We must
+   also inform the replacement unistd.h to not recursively use
+   <getopt.h>; our definitions will be present soon enough.  */
 #if @HAVE_GETOPT_H@
+# define _GL_SYSTEM_GETOPT
 # @INCLUDE_NEXT@ @NEXT_GETOPT_H@
+# undef _GL_SYSTEM_GETOPT
 #endif
 
 #ifndef _GL_GETOPT_H