Testing jandegr's fix for the windows builds issues (#806)

navit-gps · Jun 28, 2019 · b8dfa04 · b8dfa04
1 parent bef0ef8
commit b8dfa04
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git 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
@@ -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