--- uae/src/include/options.h	2018/04/24 16:46:30	1.1.1.8
+++ uae/src/include/options.h	2018/04/24 17:11:12	1.1.1.23
@@ -4,14 +4,14 @@
   * Stuff
   *
   * Copyright 1995, 1996 Ed Hanway
-  * Copyright 1995-98 Bernd Schmidt
+  * Copyright 1995-2001 Bernd Schmidt
   */
 
 #define UAEMAJOR 0
 #define UAEMINOR 8
-#define UAESUBREV 8
+#define UAESUBREV 22
 
-typedef enum { KBD_LANG_US, KBD_LANG_DE, KBD_LANG_SE, KBD_LANG_FR, KBD_LANG_IT, KBD_LANG_ES } KbdLang;
+typedef enum { KBD_LANG_US, KBD_LANG_DK, KBD_LANG_DE, KBD_LANG_SE, KBD_LANG_FR, KBD_LANG_IT, KBD_LANG_ES } KbdLang;
 
 extern long int version;
 
@@ -26,15 +26,15 @@ struct uae_prefs {
     struct strlist *unknown_lines;
 
     char description[256];
+    char info[256];
 
-    int framerate;
     int illegal_mem;
     int no_xhair;
     int use_serial;
     int serial_demand;
     int parallel_demand;
-    int automount_uaedev;
     int use_gfxlib;
+    int socket_emu;
 
     int start_debugger;
     int start_gui;
@@ -47,14 +47,17 @@ struct uae_prefs {
     int test_drawing_speed;
 
     int produce_sound;
-    int stereo;
+    int sound_stereo;
+    int mixed_stereo;
     int sound_bits;
     int sound_freq;
     int sound_minbsiz;
     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,11 +71,17 @@ struct uae_prefs {
 
     int blits_32bit_enabled;
     int immediate_blits;
+    unsigned int chipset_mask;
+    int ntscmode;
+    int collision_level;
+    int fast_copper;
 
     char df[4][256];
     char romfile[256];
+    char romextfile[256];
     char keyfile[256];
     char prtname[256];
+    char sername[256];
 
     char path_floppy[256];
     char path_hardfile[256];
@@ -82,7 +91,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;
@@ -90,14 +99,26 @@ struct uae_prefs {
     uae_u32 a3000mem_size;
     uae_u32 gfxmem_size;
 
+    int kickshifter;
+
     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_logfile;
+    int win32_iconified_nospeed;
+    int win32_iconified_nosound;
+    int win32_no_overlay; /* If this is set, we won't try and use any RGB overlays */
+    int win32_automount_drives;
+
+    int curses_reverse_video;
 };
 
 /* Contains the filename of .uaerc */
@@ -107,6 +128,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);
@@ -142,12 +165,6 @@ extern const char *gameport_state (int n
 
 extern struct uae_prefs currprefs, changed_prefs;
 
-#if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 6
-extern void write_log (const char *, ...) __attribute__ ((format (printf, 1, 2)));
-#else
-extern void write_log (const char *, ...);
-#endif
-
 extern void machdep_init (void);
 
 /* AIX doesn't think it is Unix. Neither do I. */
@@ -156,23 +173,8 @@ extern void machdep_init (void);
 #define __unix
 #endif
 
-extern char romfile[], keyfile[], prtname[], sername[];
-
-extern int cloanto_rom;
-
 #define MAX_COLOR_MODES 5
 
-extern int fast_memcmp(const void *foo, const void *bar, int len);
-extern int memcmpy(void *foo, const void *bar, int len);
-
-/*
- * You can specify numbers from 0 to 5 here. It is possible that higher
- * numbers will make the CPU emulation slightly faster, but if the setting
- * is too high, you will run out of memory while compiling.
- * Best to leave this as it is.
- */
-#define CPU_EMU_SIZE 0
-
 /* #define NEED_TO_DEBUG_BADLY */
 
 #if !defined(USER_PROGRAMS_BEHAVE)
@@ -188,7 +190,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;
@@ -228,8 +230,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);