diff options
| author | Pierre GRANDIN <pgrandin@users.noreply.github.com> | 2019-06-28 09:22:18 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-28 09:22:18 -0600 |
| commit | b8dfa045834d3434df7d3b351060c6f61dc9b735 (patch) | |
| tree | 425ba1faa9ea0ea67d829d36aefa8c857ea30f72 | |
| parent | bef0ef8da4ace12d4afc1f72690da2030fad8c77 (diff) | |
| download | navit-b8dfa045834d3434df7d3b351060c6f61dc9b735.tar.gz | |
Testing jandegr's fix for the windows builds issues (#806)
| -rwxr-xr-x | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | navit/zipfile.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a03cdc835..4890afa04 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -658,6 +658,7 @@ if (WIN32 AND NOT WINCE) set(HAVE_STDINT_H 1) list(APPEND NAVIT_LIBS winmm) set_with_reason(speech/cmdline "using native tts system of windows instead of espeak" TRUE) + set(HAVE_PRAGMA_PACK 1) endif() if(WINCE) add_plugin(support/libc "wince detected" TRUE) diff --git a/navit/zipfile.h b/navit/zipfile.h index 9edccf2ef..8002e48d9 100644 --- a/navit/zipfile.h +++ b/navit/zipfile.h @@ -167,6 +167,10 @@ struct zip64_eocl { int zip74lnum; } ATTRIBUTE_PACKED; +struct zip_alignment_check { + int x[sizeof(struct zip_cd) == 46 ? 1:-1]; +}; + #ifdef HAVE_PRAGMA_PACK #pragma pack(pop) #endif |