trying to sync rc1

src/gfxutil.c

- /*
+/*
  * UAE - The Un*x Amiga Emulator
  *
  * Common code needed by all the various graphics systems.
@@ -13,6 +13,7 @@
 #include "rtgmodes.h"
 #include "xwin.h"
 #include "gfxfilter.h"
+
 #include "uae_endian.h"
 
 int getvsyncrate (int hz)
@@ -348,9 +349,9 @@ void alloc_colors64k (int rw, int gw, int bw, int rs, int gs, int bs, int aw, in
 	xredcolor_s = rs;
 	xgreencolor_s = gs;
 	xbluecolor_s = bs;
-	xredcolor_m = (1 << rw) - 1;
-	xgreencolor_m = (1 << gw) - 1;
-	xbluecolor_m = (1 << bw) - 1;
+	xredcolor_m = ((1 << rw) - 1) << xredcolor_s;
+	xgreencolor_m = ((1 << gw) - 1) << xgreencolor_s;
+	xbluecolor_m = ((1 << bw) - 1) << xbluecolor_s;
 }
 
 static int color_diff[4096];

src/hardfile.c

- /*
+/*
  * UAE - The Un*x Amiga Emulator
  *
  * Hardfile emulation

src/include/ar.h

@@ -39,18 +39,17 @@ extern void action_replay_hide (void);
 extern void action_replay_reset (void);
 extern int action_replay_load (void);
 
-extern void action_replay_memory_reset(void);
+extern void action_replay_memory_reset (void);
 extern void action_replay_init (int);
 extern void action_replay_cleanup (void);
-extern void action_replay_chipwrite(void);
-//static--extern void action_replay_map_banks(void);
+//extern void action_replay_map_banks (void);
 extern void REGPARAM3 chipmem_lput_actionreplay23 (uaecptr addr, uae_u32 l) REGPARAM;
 extern void REGPARAM3 chipmem_wput_actionreplay23 (uaecptr addr, uae_u32 w) REGPARAM;
 extern void REGPARAM3 chipmem_bput_actionreplay1 (uaecptr addr, uae_u32 b) REGPARAM;
 extern void REGPARAM3 chipmem_wput_actionreplay1 (uaecptr addr, uae_u32 w) REGPARAM;
 extern void REGPARAM3 chipmem_lput_actionreplay1 (uaecptr addr, uae_u32 l) REGPARAM;
 
-extern void action_replay_version(void);
+extern void action_replay_version (void);
 
 extern int hrtmon_flag;
 
@@ -60,7 +59,7 @@ extern void hrtmon_ciaread (void);
 extern void hrtmon_hide (void);
 extern void hrtmon_reset (void);
 extern int hrtmon_load (void);
-extern void hrtmon_map_banks(void);
+extern void hrtmon_map_banks (void);
 
 /*extern uae_u8 *hrtmemory;*/
 extern uae_u32 hrtmem_start, hrtmem_size;

src/include/cpummu.h

@@ -39,7 +39,6 @@
 //if COMPILER(GCC) (MSVC)
 #endif
 #endif
-
 #define bool int
 #define DUNUSED(x)
 #define D

src/tools/config.log

@@ -4,7 +4,7 @@ running configure, to aid debugging if configure makes a mistake.
 It was created by configure, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
-  $ ./configure --disable-option-checking --prefix=/usr/local --with-sdl --with-sdl-gl --with-sdl-gfx --with-sdl-sound --with-caps --with-gayle --enable-drvsnd --enable-amax --enable-cd32 --enable-scsi-device --disable-jit --cache-file=/dev/null --srcdir=.
+  $ ./configure --disable-option-checking --prefix=/usr/local --with-sdl --with-sdl-gl --with-sdl-gfx --with-sdl-sound --with-caps --with-gayle --enable-drvsnd --enable-amax --enable-cd32 --enable-scsi-device --cache-file=/dev/null --srcdir=.
 
 ## --------- ##
 ## Platform. ##
@@ -445,7 +445,7 @@ configure:4344: $? = 0
 configure:4344: result: yes
 configure:4350: checking for _doprnt
 configure:4350: gcc -o conftest -g -O2 -Wall -W -Wno-unused   conftest.c  >&5
-/tmp/cclXBtVj.o: In function `main':
+/tmp/ccKkOe2m.o: In function `main':
 /home/gnostic/puaex/src/tools/conftest.c:67: undefined reference to `_doprnt'
 collect2: ld returned 1 exit status
 configure:4350: $? = 1
@@ -533,7 +533,7 @@ configure:4364: $? = 0
 configure:4364: result: yes
 configure:4364: checking for strcmpi
 configure:4364: gcc -o conftest -g -O2 -Wall -W -Wno-unused   conftest.c  >&5
-/tmp/cc5VqNdA.o: In function `main':
+/tmp/ccZO2eLu.o: In function `main':
 /home/gnostic/puaex/src/tools/conftest.c:69: undefined reference to `strcmpi'
 collect2: ld returned 1 exit status
 configure:4364: $? = 1
@@ -613,7 +613,7 @@ configure: failed program was:
 configure:4364: result: no
 configure:4364: checking for stricmp
 configure:4364: gcc -o conftest -g -O2 -Wall -W -Wno-unused   conftest.c  >&5
-/tmp/ccQPmvfF.o: In function `main':
+/tmp/ccmHyUSz.o: In function `main':
 /home/gnostic/puaex/src/tools/conftest.c:69: undefined reference to `stricmp'
 collect2: ld returned 1 exit status
 configure:4364: $? = 1

src/tools/config.status

@@ -438,7 +438,7 @@ $config_links
 
 Report bugs to the package provider."
 
-ac_cs_config="'--disable-option-checking' '--prefix=/usr/local' '--with-sdl' '--with-sdl-gl' '--with-sdl-gfx' '--with-sdl-sound' '--with-caps' '--with-gayle' '--enable-drvsnd' '--enable-amax' '--enable-cd32' '--enable-scsi-device' '--disable-jit' '--cache-file=/dev/null' '--srcdir=.'"
+ac_cs_config="'--disable-option-checking' '--prefix=/usr/local' '--with-sdl' '--with-sdl-gl' '--with-sdl-gfx' '--with-sdl-sound' '--with-caps' '--with-gayle' '--enable-drvsnd' '--enable-amax' '--enable-cd32' '--enable-scsi-device' '--cache-file=/dev/null' '--srcdir=.'"
 ac_cs_version="\
 config.status
 configured by ./configure, generated by GNU Autoconf 2.65,
@@ -522,7 +522,7 @@ if $ac_cs_silent; then
 fi
 
 if $ac_cs_recheck; then
-  set X '/bin/bash' './configure'  '--disable-option-checking' '--prefix=/usr/local' '--with-sdl' '--with-sdl-gl' '--with-sdl-gfx' '--with-sdl-sound' '--with-caps' '--with-gayle' '--enable-drvsnd' '--enable-amax' '--enable-cd32' '--enable-scsi-device' '--disable-jit' '--cache-file=/dev/null' '--srcdir=.' $ac_configure_extra_args --no-create --no-recursion
+  set X '/bin/bash' './configure'  '--disable-option-checking' '--prefix=/usr/local' '--with-sdl' '--with-sdl-gl' '--with-sdl-gfx' '--with-sdl-sound' '--with-caps' '--with-gayle' '--enable-drvsnd' '--enable-amax' '--enable-cd32' '--enable-scsi-device' '--cache-file=/dev/null' '--srcdir=.' $ac_configure_extra_args --no-create --no-recursion
   shift
   $as_echo "running CONFIG_SHELL=/bin/bash $*" >&6
   CONFIG_SHELL='/bin/bash'