diff options
| author | Paul Fertser <fercerpav@gmail.com> | 2015-01-20 20:09:02 +0300 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2015-02-04 21:56:55 +0000 |
| commit | c9639ae2acb5554c7b61cda2b4251b4e22223d8b (patch) | |
| tree | b0e8ab885fc8af4a2561666ceee5981ec4d1b47b | |
| parent | d0db4bfcec03de790d213da7c760bc452bb19d26 (diff) | |
| download | riscv-openocd-c9639ae2acb5554c7b61cda2b4251b4e22223d8b.zip riscv-openocd-c9639ae2acb5554c7b61cda2b4251b4e22223d8b.tar.gz riscv-openocd-c9639ae2acb5554c7b61cda2b4251b4e22223d8b.tar.bz2 | |
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>
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/helper/replacements.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index ce28633..3605846 100644 --- a/configure.ac +++ b/configure.ac @@ -623,6 +623,10 @@ case $host in ;; 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.]) diff --git a/src/helper/replacements.h b/src/helper/replacements.h index 565fe9d..2776602 100644 --- 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 -#define WIN32_LEAN_AND_MEAN #include <windows.h> #include <time.h> |