Rebase branch

src/dos/drive_fat.cpp

@@ -54,9 +54,9 @@
 #define FAT12                   0
 #define FAT16                   1
 #define FAT32                   2
+#endif
 
 extern bool _driveUsed;
-#endif
 
 static uint16_t dpos[256];
 static uint32_t dnum[256];

src/dosbox.cpp

@@ -95,6 +95,16 @@ struct __processor_model {
 } __cpu_model = {0, 0, 0, {0}};
 #endif
 
+#if __APPLE__ && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
+/* FIX_ME: A workaround to avoid build error. Change version to 101300 if error occurs for Sierra (10.12) */
+struct __processor_model {
+  unsigned int __cpu_vendor;
+  unsigned int __cpu_type;
+  unsigned int __cpu_subtype;
+  unsigned int __cpu_features[1];
+} __cpu_model = {0, 0, 0, {0}};
+#endif
+
 #if C_EMSCRIPTEN
 # include <emscripten.h>
 #endif