--- uae/src/include/options.h	2018/04/24 16:47:45	1.1.1.9
+++ uae/src/include/options.h	2018/04/24 16:50:25	1.1.1.11
@@ -9,7 +9,7 @@
 
 #define UAEMAJOR 0
 #define UAEMINOR 8
-#define UAESUBREV 9
+#define UAESUBREV 10
 
 typedef enum { KBD_LANG_US, KBD_LANG_DE, KBD_LANG_SE, KBD_LANG_FR, KBD_LANG_IT, KBD_LANG_ES } KbdLang;
 
@@ -54,6 +54,7 @@ struct uae_prefs {
     int sound_maxbsiz;
     int sound_pri_time;
     int sound_pri_cutoff;
+    int sound_interpol;
 
     int gfx_framerate;
     int gfx_width;
@@ -107,6 +108,7 @@ struct uae_prefs {
     int win32_logfile;
     int win32_iconified_nospeed;
     int win32_iconified_nosound;
+    int curses_reverse_video;
 };
 
 /* Contains the filename of .uaerc */
@@ -116,6 +118,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);
@@ -197,7 +201,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;
@@ -240,7 +244,7 @@ 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);