diff options
| author | David Tardon <dtardon@redhat.com> | 2012-03-08 13:16:20 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-03-12 08:53:39 +0100 |
| commit | 3b521d1bc640258782372bf0d11889419304ade8 (patch) | |
| tree | 7beebf2865261b7dd4cbe832573e82fcbd28111c /shell | |
| parent | c169483c49f78ce72d751610bb3b04103f8132c5 (diff) | |
WaE: "_WIN32_WINNT" redefined
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/all/makefile.mk | 8 | ||||
| -rw-r--r-- | shell/source/win32/ooofilereader/makefile.mk | 8 | ||||
| -rw-r--r-- | shell/source/win32/shlxthandler/makefile.mk | 4 | ||||
| -rw-r--r-- | shell/source/win32/shlxthandler/util/makefile.mk | 8 |
4 files changed, 14 insertions, 14 deletions
diff --git a/shell/source/all/makefile.mk b/shell/source/all/makefile.mk index 87312d3b13f9..8791e62a8717 100644 --- a/shell/source/all/makefile.mk +++ b/shell/source/all/makefile.mk @@ -38,18 +38,18 @@ VISIBILITY_HIDDEN = TRUE .INCLUDE : settings.mk .IF "$(GUI)" == "WNT" -CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501 +CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE .IF "$(COM)" == "MSC" CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 .ENDIF -CDEFS+=-D_WIN32_IE=0x501 +CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 .IF "$(BUILD_X64)"!="" -CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501 +CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE .IF "$(COM)" == "MSC" CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 .ENDIF -CDEFS_X64+=-D_WIN32_IE=0x501 +CDEFS_X64+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 .ENDIF # "$(BUILD_X64)"!="" .ENDIF diff --git a/shell/source/win32/ooofilereader/makefile.mk b/shell/source/win32/ooofilereader/makefile.mk index 90f0429132fc..6b9d1efe3664 100644 --- a/shell/source/win32/ooofilereader/makefile.mk +++ b/shell/source/win32/ooofilereader/makefile.mk @@ -36,16 +36,16 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501 +CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE .IF "$(COM)" == "MSC" CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 .ENDIF -CDEFS+=-D_WIN32_IE=0x501 -CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501 +CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 +CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE .IF "$(COM)" == "MSC" CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 .ENDIF -CDEFS_X64+=-D_WIN32_IE=0x501 +CDEFS_X64+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 # --- Files -------------------------------------------------------- diff --git a/shell/source/win32/shlxthandler/makefile.mk b/shell/source/win32/shlxthandler/makefile.mk index 5778ccebd50d..b02a27838754 100644 --- a/shell/source/win32/shlxthandler/makefile.mk +++ b/shell/source/win32/shlxthandler/makefile.mk @@ -49,7 +49,7 @@ ALL : UWINAPILIB = UWINAPILIB_X64 = -CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501 +CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE .IF "$(COM)" == "MSC" CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 .ENDIF @@ -57,7 +57,7 @@ CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 CDEFS+=-DDONT_HAVE_GDIPLUS .ENDIF -CDEFS+=-D_WIN32_IE=0x501 +CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 # --- Files -------------------------------------------------------- diff --git a/shell/source/win32/shlxthandler/util/makefile.mk b/shell/source/win32/shlxthandler/util/makefile.mk index dff0fa9faf7f..f2edb7f3719e 100644 --- a/shell/source/win32/shlxthandler/util/makefile.mk +++ b/shell/source/win32/shlxthandler/util/makefile.mk @@ -35,17 +35,17 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501 +CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE .IF "$(COM)" == "MSC" CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 .ENDIF -CDEFS+=-D_WIN32_IE=0x501 +CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 -CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501 +CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE .IF "$(COM)" == "MSC" CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 .ENDIF -CDEFS_X64+=-D_WIN32_IE=0x501 +CDEFS_X64+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 # --- Files -------------------------------------------------------- |