--- uae/src/include/options.h	2018/04/24 16:45:14	1.1.1.7
+++ uae/src/include/options.h	2018/04/24 16:57:09	1.1.1.15
@@ -9,7 +9,7 @@
 
 #define UAEMAJOR 0
 #define UAEMINOR 8
-#define UAESUBREV 7
+#define UAESUBREV 15
 
 typedef enum { KBD_LANG_US, KBD_LANG_DE, KBD_LANG_SE, KBD_LANG_FR, KBD_LANG_IT, KBD_LANG_ES } KbdLang;
 
@@ -27,7 +27,6 @@ struct uae_prefs {
 
     char description[256];
 
-    int framerate;
     int illegal_mem;
     int no_xhair;
     int use_serial;
@@ -35,6 +34,7 @@ struct uae_prefs {
     int parallel_demand;
     int automount_uaedev;
     int use_gfxlib;
+    int socket_emu;
 
     int start_debugger;
     int start_gui;
@@ -54,7 +54,9 @@ struct uae_prefs {
     int sound_maxbsiz;
     int sound_pri_time;
     int sound_pri_cutoff;
+    int sound_interpol;
 
+    int gfx_framerate;
     int gfx_width;
     int gfx_height;
     int gfx_lores;
@@ -68,6 +70,9 @@ struct uae_prefs {
 
     int blits_32bit_enabled;
     int immediate_blits;
+    unsigned int chipset_mask;
+    int ntscmode;
+    int collision_level;
 
     char df[4][256];
     char romfile[256];
@@ -82,7 +87,7 @@ struct uae_prefs {
     int cpu_level;
     int cpu_compatible;
     int address_space_24;
-    
+
     uae_u32 z3fastmem_size;
     uae_u32 fastmem_size;
     uae_u32 chipmem_size;
@@ -92,12 +97,21 @@ struct uae_prefs {
 
     struct uaedev_mount_info *mountinfo;
 
+    int nr_floppies;
+
     /* Target specific options */
     int x11_use_low_bandwidth;
     int x11_use_mitshm;
     int x11_use_dgamode;
     int x11_hide_cursor;
     int svga_no_linear;
+    int win32_middle_mouse;
+    int win32_sound_style;
+    int win32_sound_tweak;
+    int win32_logfile;
+    int win32_iconified_nospeed;
+    int win32_iconified_nosound;
+    int curses_reverse_video;
 };
 
 /* Contains the filename of .uaerc */
@@ -107,6 +121,8 @@ extern void save_options (FILE *, struct
 extern void default_prefs (struct uae_prefs *);
 extern void discard_prefs (struct uae_prefs *);
 
+extern int parse_cmdline_option (char, char *);
+
 extern int cfgfile_yesno (char *option, char *value, char *name, int *location);
 extern int cfgfile_intval (char *option, char *value, char *name, int *location, int scale);
 extern int cfgfile_strval (char *option, char *value, char *name, int *location, const char *table[], int more);
@@ -118,10 +134,8 @@ extern void target_save_options (FILE *,
 
 extern int cfgfile_load (struct uae_prefs *, const char *filename);
 extern int cfgfile_save (struct uae_prefs *, const char *filename);
-struct mount_data;
-extern void cfgfile_parse_line (struct uae_prefs *p, char *, struct mount_data **);
-extern int cfgfile_parse_option (struct uae_prefs *p, char *option, char *value,
-				 struct mount_data **);
+extern void cfgfile_parse_line (struct uae_prefs *p, char *);
+extern int cfgfile_parse_option (struct uae_prefs *p, char *option, char *value);
 extern int cfgfile_get_description (const char *filename, char *description);
 extern void cfgfile_show_usage (void);
 
@@ -190,7 +204,7 @@ extern int memcmpy(void *foo, const void
  * may need some padding for the array. */
 
 #define fuzzy_memset(p, c, o, l) fuzzy_memset_1 ((p), QUADRUPLIFY (c), (o) & ~3, ((l) + 4) >> 2)
-static __inline__ void fuzzy_memset_1 (void *p, uae_u32 c, int offset, int len)
+STATIC_INLINE void fuzzy_memset_1 (void *p, uae_u32 c, int offset, int len)
 {
     uae_u32 *p2 = (uae_u32 *)((char *)p + offset);
     int a = len & 7;
@@ -230,8 +244,10 @@ static __inline__ void fuzzy_memset_1 (v
     }
 }
 
+/* This one knows it will never be asked to clear more than 32 bytes.  Make sure you call this with a
+   constant for the length.  */
 #define fuzzy_memset_le32(p, c, o, l) fuzzy_memset_le32_1 ((p), QUADRUPLIFY (c), (o) & ~3, ((l) + 7) >> 2)
-static __inline__ void fuzzy_memset_le32_1 (void *p, uae_u32 c, int offset, int len)
+STATIC_INLINE void fuzzy_memset_le32_1 (void *p, uae_u32 c, int offset, int len)
 {
     uae_u32 *p2 = (uae_u32 *)((char *)p + offset);