diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2018-12-31 23:57:35 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2018-12-31 23:58:29 -0600 |
| commit | ea864b56d115e4f7a7205827ecaaba0e1db81d41 (patch) | |
| tree | 2dc92ce2a53295a99f482e1226398ffd97f7b5d2 /src/wixstdba/precomp.h | |
| parent | 2c568de11510b453f499827919964badef22304e (diff) | |
| download | wix-ea864b56d115e4f7a7205827ecaaba0e1db81d41.tar.gz wix-ea864b56d115e4f7a7205827ecaaba0e1db81d41.tar.bz2 wix-ea864b56d115e4f7a7205827ecaaba0e1db81d41.zip | |
Integrate into latest v4.
Diffstat (limited to 'src/wixstdba/precomp.h')
| -rw-r--r-- | src/wixstdba/precomp.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/wixstdba/precomp.h b/src/wixstdba/precomp.h index a0390fe2..925a80ce 100644 --- a/src/wixstdba/precomp.h +++ b/src/wixstdba/precomp.h | |||
| @@ -3,7 +3,12 @@ | |||
| 3 | 3 | ||
| 4 | 4 | ||
| 5 | #include <windows.h> | 5 | #include <windows.h> |
| 6 | |||
| 7 | #pragma warning(push) | ||
| 8 | #pragma warning(disable:4458) // declaration of 'xxx' hides class member | ||
| 6 | #include <gdiplus.h> | 9 | #include <gdiplus.h> |
| 10 | #pragma warning(pop) | ||
| 11 | |||
| 7 | #include <msiquery.h> | 12 | #include <msiquery.h> |
| 8 | #include <objbase.h> | 13 | #include <objbase.h> |
| 9 | #include <shlobj.h> | 14 | #include <shlobj.h> |