From 62cec291d3204ae6eb30a9f5748b48fc4107efc9 Mon Sep 17 00:00:00 2001
From: Morgan Deters <mdeters@cs.nyu.edu>
Date: Thu, 18 Jul 2013 16:31:20 -0400
Subject: Fixes for building with mingw win64.

---
 src/options/options_template.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/options')

diff --git a/src/options/options_template.cpp b/src/options/options_template.cpp
index 8af61b79f..229c25597 100644
--- a/src/options/options_template.cpp
+++ b/src/options/options_template.cpp
@@ -14,14 +14,18 @@
  ** Contains code for handling command-line options
  **/
 
-#if !defined(_BSD_SOURCE) && (defined(__MINGW32__) || defined(__MINGW64__))
-// force use of optreset; mingw croaks on argv-switching otherwise
+#if !defined(_BSD_SOURCE) && defined(__MINGW32__) && !defined(__MINGW64__)
+// force use of optreset; mingw32 croaks on argv-switching otherwise
 #  include "cvc4autoconfig.h"
 #  define _BSD_SOURCE
 #  undef HAVE_DECL_OPTRESET
 #  define HAVE_DECL_OPTRESET 1
 #  define CVC4_IS_NOT_REALLY_BSD
-#endif /* !_BSD_SOURCE && (__MINGW32__ || __MINGW64__) */
+#endif /* !_BSD_SOURCE && __MINGW32__ && !__MINGW64__ */
+
+#ifdef __MINGW64__
+extern int optreset;
+#endif /* __MINGW64__ */
 
 #include <getopt.h>
 
-- 
cgit v1.2.3