diff --git a/library/include/dfhack/modules/Maps.h b/library/include/dfhack/modules/Maps.h index 1df29a511..47a61c115 100644 --- a/library/include/dfhack/modules/Maps.h +++ b/library/include/dfhack/modules/Maps.h @@ -61,19 +61,16 @@ namespace DFHack { return DFCoord(x,y,z+number); } - // this is a clever hack. beware. + // this is a hack. beware. // x,y,z share the same space with comparate. comparate can be used for fast comparisons union { - #pragma pack(push) /* push current alignment to stack */ - #pragma pack(2) /* set alignment to 2 byte boundary */ struct { uint16_t x; uint16_t y; uint32_t z; }; - #pragma pack (pop) /* restore alignment */ uint64_t comparate; }; }; diff --git a/library/private/Internal.h b/library/private/Internal.h index 8a6ad69b0..13c9119e1 100644 --- a/library/private/Internal.h +++ b/library/private/Internal.h @@ -81,7 +81,7 @@ using namespace std; #include #include #include - #include + //#include // NOT present in mingw32 typedef LONG NTSTATUS; #define STATUS_SUCCESS ((NTSTATUS)0x00000000L)