diff options
| author | Siri Hansen <[email protected]> | 2017-05-19 15:27:46 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-05-19 15:27:46 +0200 |
| commit | 52ace0d2c565a67e587159780114792c55244312 (patch) | |
| tree | 1b21b16cc9c14cf78f4c9ed30f302bd8165a8736 /lib/wx/c_src | |
| parent | 7ff352ef8a5393a017ce493ba1a1fc3be54be245 (diff) | |
| parent | a237426d43b73d931739d9acb86a17513b44ed3e (diff) | |
| download | otp-52ace0d2c565a67e587159780114792c55244312.tar.gz otp-52ace0d2c565a67e587159780114792c55244312.tar.bz2 otp-52ace0d2c565a67e587159780114792c55244312.zip | |
Merge branch 'master' into jv-gen-server-exits
Diffstat (limited to 'lib/wx/c_src')
| -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__) |