diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2018-12-29 22:18:45 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2018-12-29 22:20:26 -0600 |
| commit | 3480ec56611d6c8784b7610dcac818133318f675 (patch) | |
| tree | a80517a5ad1997b94527f81cfb81fa86e12a0927 /src/engine/precomp.h | |
| parent | 61847dddd4fd497057c780658e383c4627de19ec (diff) | |
| download | wix-3480ec56611d6c8784b7610dcac818133318f675.tar.gz wix-3480ec56611d6c8784b7610dcac818133318f675.tar.bz2 wix-3480ec56611d6c8784b7610dcac818133318f675.zip | |
Integrate into latest v4
Diffstat (limited to 'src/engine/precomp.h')
| -rw-r--r-- | src/engine/precomp.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/engine/precomp.h b/src/engine/precomp.h index d3ebe354..477dc310 100644 --- a/src/engine/precomp.h +++ b/src/engine/precomp.h | |||
| @@ -4,12 +4,15 @@ | |||
| 4 | 4 | ||
| 5 | #define ExitTrace LogErrorString | 5 | #define ExitTrace LogErrorString |
| 6 | 6 | ||
| 7 | #include <wixver.h> | ||
| 8 | |||
| 9 | #include <windows.h> | 7 | #include <windows.h> |
| 10 | #include <aclapi.h> | 8 | #include <aclapi.h> |
| 11 | #include <Bits.h> | 9 | #include <Bits.h> |
| 10 | |||
| 11 | #pragma warning(push) | ||
| 12 | #pragma warning(disable:4458) // declaration of 'xxx' hides class member | ||
| 12 | #include <gdiplus.h> | 13 | #include <gdiplus.h> |
| 14 | #pragma warning(pop) | ||
| 15 | |||
| 13 | #include <math.h> | 16 | #include <math.h> |
| 14 | #include <msiquery.h> | 17 | #include <msiquery.h> |
| 15 | #include <sddl.h> | 18 | #include <sddl.h> |