[tor-commits] [tor/master] More windows header stuff. Will it work this time?

[nickm at torproject.org]

commit 4438b2a0e3822e464c4b6628944d76757d2237cb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 9 14:58:16 2015 -0400

    More windows header stuff. Will it work this time?
---
 configure.ac |   24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6fbd489..e150146 100644
--- a/configure.ac
+++ b/configure.ac
@@ -335,11 +335,25 @@ bwin32=true; AC_MSG_RESULT([yes]),
 bwin32=false; AC_MSG_RESULT([no]))
 fi
 
-if test "$bwin32" = true; then
-  AC_DEFINE(WIN32_LEAN_AND_MEAN, 1, [Defined to avoid including some windows headers])
-  AC_DEFINE(WINVER, 0x0501, [Defined to access windows functions and definitions for >=WinXP])
-  AC_DEFINE(_WIN32_WINNT, 0x0501, [Defined to access windows functions and definitions for >=WinXP])
-fi
+AH_BOTTOM([
+#ifdef _WIN32
+/* Defined to access windows functions and definitions for >=WinXP */
+# ifndef WINVER
+#  define WINVER 0x0501
+# endif
+
+/* Defined to access _other_ windows functions and definitions for >=WinXP */
+# ifndef _WIN32_WINNT
+#  define _WIN32_WINNT 0x0501
+# endif
+
+/* Defined to avoid including some windows headers as part of Windows.h */
+# ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN 1
+# endif
+#endif
+])
+
 
 AM_CONDITIONAL(BUILD_NT_SERVICES, test x$bwin32 = xtrue)