diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-03-01 14:11:28 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-03-01 14:11:28 +0100 |
| commit | aa74dd15c39d6b859456aafd78d435763436725d (patch) | |
| tree | 201b5c338e4e4afb1181ccff52735073fec6153e /lib/wx | |
| parent | 532efc24803e19f47ce19124f4be16a42ac94a75 (diff) | |
| parent | 75bc5bebc070a59535b8f6b7b9085c210b4723b5 (diff) | |
| download | otp-aa74dd15c39d6b859456aafd78d435763436725d.tar.gz otp-aa74dd15c39d6b859456aafd78d435763436725d.tar.bz2 otp-aa74dd15c39d6b859456aafd78d435763436725d.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/wx')
| -rw-r--r-- | lib/wx/configure.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/wx/configure.in b/lib/wx/configure.in index 48fcca640c..bf27b72aa7 100644 --- a/lib/wx/configure.in +++ b/lib/wx/configure.in @@ -164,14 +164,14 @@ case $host_os in CPPFLAGS="$CPPFLAGS -D_MACOSX $PTHR_CFLAGS" ;; mingw32) - CFLAGS="$CFLAGS -DWIN32 -DWINVER=0x0500 -D_WINDOWS -D_UNICODE -DUNICODE" - CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0500" + CFLAGS="$CFLAGS -DWIN32 -DWINVER=0x0600 -D_WINDOWS -D_UNICODE -DUNICODE" + CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0600" AC_MSG_WARN([Reverting to 32-bit time_t]) CPPFLAGS="$CPPFLAGS -D_USE_32BIT_TIME_T" ;; win32) - CFLAGS="$CFLAGS -DWIN32 -DWINVER=0x0500 -D_WINDOWS -D_UNICODE -DUNICODE" - CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0500" + CFLAGS="$CFLAGS -DWIN32 -DWINVER=0x0600 -D_WINDOWS -D_UNICODE -DUNICODE" + CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x0600" ;; *) CFLAGS="$CFLAGS -Wno-deprecated-declarations" |