merged build fix from RC_0_16

This commit is contained in:
Arvid Norberg 2012-08-16 03:03:29 +00:00
parent 70d3170963
commit 9bdcadb7ad
3 changed files with 7 additions and 0 deletions

View File

@ -63,7 +63,9 @@ rule linking ( properties * )
} }
} }
# dbghelp doesn't appear to exist in mingw
if <target-os>windows in $(properties) if <target-os>windows in $(properties)
&& ! <toolset>gcc in $(properties)
&& ( <asserts>on in $(properties) && ( <asserts>on in $(properties)
|| <variant>debug in $(properties) || <variant>debug in $(properties)
|| <asio-debugging>on in $(properties) ) || <asio-debugging>on in $(properties) )

View File

@ -50,7 +50,9 @@ POSSIBILITY OF SUCH DAMAGE.
#endif #endif
#if !defined _MSC_VER || _MSC_VER >= 1600 #if !defined _MSC_VER || _MSC_VER >= 1600
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS 1 #define __STDC_LIMIT_MACROS 1
#endif
#include <stdint.h> // for INT64_MAX #include <stdint.h> // for INT64_MAX
#else #else
#if !defined INT64_MAX #if !defined INT64_MAX
@ -59,7 +61,9 @@ POSSIBILITY OF SUCH DAMAGE.
#endif #endif
#ifndef _MSC_VER #ifndef _MSC_VER
#ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS 1 #define __STDC_FORMAT_MACROS 1
#endif
#include <inttypes.h> // for PRId64 et.al. #include <inttypes.h> // for PRId64 et.al.
#endif #endif

View File

@ -59,6 +59,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include <windows.h> #include <windows.h>
#include <winioctl.h> #include <winioctl.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h>
#else #else
// posix part // posix part
#define _FILE_OFFSET_BITS 64 #define _FILE_OFFSET_BITS 64