This is an automated email from Gerrit. Paul Fertser (fercer...@gmail.com) just uploaded a new patch set to Gerrit, which you can find at http://openocd.zylin.com/2486
-- gerrit commit 5a13778a3abe6ac56e6418fd8689506602c263d7 Author: Paul Fertser <fercer...@gmail.com> Date: Tue Jan 20 20:09:02 2015 +0300 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 mingwandroid from the MSYS2 team. Change-Id: I376a5fb3d106786515d7e1ba44dbd751e4dcdb1b Signed-off-by: Paul Fertser <fercer...@gmail.com> 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> -- ------------------------------------------------------------------------------ New Year. New Location. New Benefits. New Data Center in Ashburn, VA. GigeNET is offering a free month of service with a new server in Ashburn. Choose from 2 high performing configs, both with 100TB of bandwidth. Higher redundancy.Lower latency.Increased capacity.Completely compliant. http://p.sf.net/sfu/gigenet _______________________________________________ OpenOCD-devel mailing list OpenOCD-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openocd-devel