Fix getopt header confusion.

Our copy of getopt.h in lib/win32 was beating the system getopt.h in the
search path, and providing different definitions, which clang picked up.

Renamed our getopt.h to bsd_getopt.h, and added a box_getopt.h to decide
whether to include this one instead of the system getopt.h.

3 files changed, 23 insertions, 7 deletions

diff --git a/lib/win32/box_getopt.h b/lib/win32/box_getopt.h
new file mode 100644
index 00000000..f18446d4
--- /dev/null
+++ b/lib/win32/box_getopt.h
@@ -0,0 +1,14 @@
+#if defined _MSC_VER || defined __MINGW32__
+#define	REPLACE_GETOPT 1 /* use this getopt as the system getopt(3) */
+#else
+#define	REPLACE_GETOPT 0 // force a conflict if included multiple times
+#endif
+
+#if REPLACE_GETOPT
+#	include "bsd_getopt.h"
+#	define BOX_BSD_GETOPT
+#else
+#	include <getopt.h>
+#	undef BOX_BSD_GETOPT
+#endif
+
diff --git a/lib/win32/getopt.h b/lib/win32/bsd_getopt.h
index 7c290343..9cfdd32e 100755
--- a/lib/win32/getopt.h
+++ b/lib/win32/bsd_getopt.h
@@ -37,6 +37,12 @@
  * POSSIBILITY OF SUCH DAMAGE.

  */

 

+#ifndef REPLACE_GETOPT

+#error You must include box_getopt.h, not bsd_getopt.h

+#endif

+

+#if REPLACE_GETOPT // defined in box_getopt.h; until end of file

+

 #ifndef _GETOPT_H_

 #define _GETOPT_H_

 

@@ -96,3 +102,4 @@ extern   char *suboptarg;               /* getsubopt(3) external variable */
 __END_DECLS

  

 #endif /* !_GETOPT_H_ */

+#endif // REPLACE_GETOPT

diff --git a/lib/win32/getopt_long.cpp b/lib/win32/getopt_long.cpp
index 31695aa0..941f23c1 100755
--- a/lib/win32/getopt_long.cpp
+++ b/lib/win32/getopt_long.cpp
@@ -68,16 +68,13 @@
 

 #include "getopt.h"

 

-#if defined _MSC_VER || defined __MINGW32__

-#define	REPLACE_GETOPT		/* use this getopt as the system getopt(3) */

+#ifdef REPLACE_GETOPT // until end of file

 

-#ifdef REPLACE_GETOPT

 int	opterr = 1;		/* if error message should be printed */

 int	optind = 1;		/* index into parent argv vector */

 int	optopt = '?';		/* character checked for validity */

 int	optreset;		/* reset getopt */

 char    *optarg;		/* argument associated with option */

-#endif

 

 #define PRINT_ERROR	((opterr) && (*options != ':'))

 

@@ -499,7 +496,6 @@ start:
 	return (optchar);

 }

 

-#ifdef REPLACE_GETOPT

 /*

  * getopt --

  *	Parse argc/argv argument vector.

@@ -520,7 +516,6 @@ getopt(int nargc, char * const *nargv, const char *options)
 	 */

 	return (getopt_internal(nargc, nargv, options, NULL, NULL, 0));

 }

-#endif /* REPLACE_GETOPT */

 

 /*

  * getopt_long --

@@ -548,4 +543,4 @@ getopt_long_only(int nargc, char * const *nargv, const char *options,
 	    FLAG_PERMUTE|FLAG_LONGONLY));

 }

 

-#endif // defined _MSC_VER || defined __MINGW32__

+#endif // REPLACE_GETOPT