--- uae/src/include/options.h	2018/04/24 16:41:12	1.1.1.4
+++ uae/src/include/options.h	2018/04/24 16:42:32	1.1.1.5
@@ -4,16 +4,18 @@
   * Stuff
   *
   * Copyright 1995, 1996 Ed Hanway
-  * Copyright 1995-97 Bernd Schmidt
+  * Copyright 1995-98 Bernd Schmidt
   */
 
 #define UAEMAJOR 0
-#define UAEMINOR 7
-#define UAEURSAMINOR 6
+#define UAEMINOR 8
+#define UAESUBREV 5
 
 typedef enum { KBD_LANG_US, KBD_LANG_DE, KBD_LANG_SE, KBD_LANG_FR, KBD_LANG_IT, KBD_LANG_ES } KbdLang;
 
-extern int version;
+extern long int version;
+
+struct uaedev_mount_info;
 
 struct uae_prefs {
     int framerate;
@@ -42,6 +44,8 @@ struct uae_prefs {
     int gfx_lores;
     int gfx_linedbl;
     int gfx_correct_aspect;
+    int gfx_afullscreen;
+    int gfx_pfullscreen;
     int gfx_xcenter;
     int gfx_ycenter;
     int color_mode;
@@ -49,6 +53,7 @@ struct uae_prefs {
     /* X11 specific options */
     int use_low_bandwidth;
     int use_mitshm;
+    int use_dgamode;
 
     int blits_32bit_enabled;
     int immediate_blits;
@@ -59,8 +64,24 @@ 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;
+    uae_u32 bogomem_size;
+    uae_u32 a3000mem_size;
+    uae_u32 gfxmem_size;
+    
+    struct uaedev_mount_info *mountinfo;
 };
 
+extern void fixup_prefs_dimensions (struct uae_prefs *prefs);
+
+extern void check_prefs_changed_custom (void);
+extern void check_prefs_changed_cpu (void);
+extern void check_prefs_changed_audio (void);
+extern int check_prefs_changed_gfx (void);
+
 #define JSEM_DECODEVAL(n,v) (((v) >> (n*8)) & 255)
 /* Determine how port n is configured with the value v in fake_joystick */
 #define JSEM_ISJOY0(n,v) (JSEM_DECODEVAL(n,v) == 0)
@@ -70,13 +91,19 @@ struct uae_prefs {
 #define JSEM_ISCURSOR(n,v) (JSEM_DECODEVAL(n,v) == 4)
 #define JSEM_ISSOMEWHEREELSE(n,v) (JSEM_DECODEVAL(n,v) == 5)
 extern const char *gameport_state (int n);
+extern int parse_joy_spec (char *spec);
 
 /* These preferences make sense only at startup. */
 extern int no_gui, use_debugger, use_gfxlib;
 
 extern struct uae_prefs currprefs, changed_prefs;
 
-extern void write_log (const char *);
+#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. */
@@ -177,36 +204,6 @@ static __inline__ void fuzzy_memset_le32
     }
 }
 
-/*
- * Frame rate hack. Currently only implemented for Pentium (P6?) CPUs.
- */
-#if !defined __GNUC_MINOR__
-#undef HAVE_RDTSC
-#endif
-
-#undef HAVE_INLINE_RPT
-#ifdef HAVE_RDTSC
-#define FRAME_RATE_HACK
-
-typedef unsigned long frame_time_t;
-static inline frame_time_t read_processor_time (void)
-{
-    frame_time_t foo;
-    /* Don't assume the assembler knows rdtsc */
-    __asm__ __volatile__ (".byte 0x0f,0x31" : "=a" (foo) :);
-    return foo;
-}
-#define HAVE_INLINE_RPT
-#else
-typedef int frame_time_t;
-#endif
-
-#if defined FRAME_RATE_HACK && !defined HAVE_INLINE_RPT
-extern frame_time_t read_processor_time (void);
-#endif
-extern frame_time_t vsynctime, vsyncmintime;
-
 #if defined(AMIGA) && defined(__GNUC__)
 #include "od-amiga/amiga-kludges.h"
 #endif
-