Skip to content

Commit c9639ae

Browse files
paulfertserntfreak
authored andcommitted
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 <[email protected]> Reviewed-on: http://openocd.zylin.com/2486 Tested-by: jenkins Reviewed-by: Xiaofan <[email protected]> Reviewed-by: Spencer Oliver <[email protected]>
1 parent d0db4bf commit c9639ae

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

configure.ac

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -623,6 +623,10 @@ case $host in
623623
;;
624624
esac
625625

626+
if test $is_win32 = yes; then
627+
AC_DEFINE([WIN32_LEAN_AND_MEAN], [1], [1 to exclude old conflicting definitions when building on Windows])
628+
fi
629+
626630
if test $build_parport = yes; then
627631
build_bitbang=yes
628632
AC_DEFINE([BUILD_PARPORT], [1], [1 if you want parport.])

src/helper/replacements.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ static inline unsigned usleep(unsigned int usecs)
135135
/* Windows specific */
136136
#ifdef _WIN32
137137

138-
#define WIN32_LEAN_AND_MEAN
139138
#include <windows.h>
140139
#include <time.h>
141140

0 commit comments

Comments
 (0)