configure: define WIN32_LEAN_AND_MEAN early to make it effective

This macro makes windows builds faster and helps with the old "#define
interface struct" issue as the word "interface" is part of libusb-0.1
API. However, defining it in replacements.h is too late, as windows.h
gets included by that time from somewhere else.

This solution is provided by Ray Donnelly from the MSYS2 team.

Change-Id: I376a5fb3d106786515d7e1ba44dbd751e4dcdb1b
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/2486
Tested-by: jenkins
Reviewed-by: Xiaofan <xiaofanc@gmail.com>
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>

diff --git a/configure.ac b/configure.ac
index ce28633812d909fdcc0a2e27223a938d6a5f6b73..36058466bb53373b7cec52ca93c6673352b6b527 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -623,6 +623,10 @@ case $host in
     ;;
 esac
 
     ;;
 esac
 

+if test $is_win32 = yes; then
+    AC_DEFINE([WIN32_LEAN_AND_MEAN], [1], [1 to exclude old conflicting definitions when building on Windows])
+fi
+

 if test $build_parport = yes; then
   build_bitbang=yes
   AC_DEFINE([BUILD_PARPORT], [1], [1 if you want parport.])
 if test $build_parport = yes; then
   build_bitbang=yes
   AC_DEFINE([BUILD_PARPORT], [1], [1 if you want parport.])

diff --git a/src/helper/replacements.h b/src/helper/replacements.h
index 565fe9dca83600bb68dc9489ace7b814a5d7eaf8..277660228e796d275d4bc0ec9ebc86c87f2a9c28 100644 (file)
--- a/src/helper/replacements.h
+++ b/src/helper/replacements.h
@@ -135,7 +135,6 @@ static inline unsigned usleep(unsigned int usecs)
 /* Windows specific */
 #ifdef _WIN32
 
 /* Windows specific */
 #ifdef _WIN32
 

-#define WIN32_LEAN_AND_MEAN

 #include <windows.h>
 #include <time.h>
 
 #include <windows.h>
 #include <time.h>