diff options
| author | Dan Gudmundsson <[email protected]> | 2017-05-17 15:04:41 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2017-05-17 15:04:41 +0200 |
| commit | 429c139eb828a7f69db407e924d4639ac86df880 (patch) | |
| tree | a6489de15676e9f3c7798c3db60275c2430234da /lib | |
| parent | dfa81717e0e5b07eaecae536523c820368e900de (diff) | |
| parent | 327036428ff18a4268d4c10506945efe7ca1d66c (diff) | |
| download | otp-429c139eb828a7f69db407e924d4639ac86df880.tar.gz otp-429c139eb828a7f69db407e924d4639ac86df880.tar.bz2 otp-429c139eb828a7f69db407e924d4639ac86df880.zip | |
Merge branch 'dgud/wx/fix-msvc-2015'
* dgud/wx/fix-msvc-2015:
wx: Fix builds on VS-2017
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/wx/c_src/egl_impl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/wx/c_src/egl_impl.h b/lib/wx/c_src/egl_impl.h index 719b4926db..7ecd484de5 100644 --- a/lib/wx/c_src/egl_impl.h +++ b/lib/wx/c_src/egl_impl.h @@ -112,7 +112,7 @@ typedef long int int32_t; typedef long long int int64_t; typedef unsigned long long int uint64_t; #elif defined(WIN32) && defined(_MSC_VER) -typedef long int int32_t; +typedef __int32 int32_t; typedef __int64 int64_t; typedef unsigned __int64 uint64_t; #elif defined(WIN32) && defined(__GNUC__) |