--- Frodo4/Src/Display_x.h	2003/07/01 17:32:13	1.1
+++ Frodo4/Src/Display_x.h	2009/01/11 11:32:38	1.7
@@ -2,7 +2,7 @@
  *  Display_x.h - C64 graphics display, emulator window handling,
  *                X specific stuff
  *
- *  Frodo (C) 1994-1997,2002 Christian Bauer
+ *  Frodo (C) 1994-1997,2002-2009 Christian Bauer
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -342,7 +342,7 @@ C64Display::C64Display(C64 *the_c64) : T
 	// Start timer for LED error blinking
 	c64_disp = this;
 	pulse_sa.sa_handler = (void (*)(int))pulse_handler;
-	pulse_sa.sa_flags = 0;
+	pulse_sa.sa_flags = SA_RESTART;
 	sigemptyset(&pulse_sa.sa_mask);
 	sigaction(SIGALRM, &pulse_sa, NULL);
 	pulse_tv.it_interval.tv_sec = 0;
@@ -775,6 +775,26 @@ bool C64Display::NumLock(void)
 
 
 /*
+ *  Open/close joystick drivers given old and new state of
+ *  joystick preferences
+ */
+
+void C64::open_close_joysticks(int oldjoy1, int oldjoy2, int newjoy1, int newjoy2)
+{
+}
+
+
+/*
+ *  Poll joystick port, return CIA mask
+ */
+
+uint8 C64::poll_joystick(int port)
+{
+	return 0xff;
+}
+
+
+/*
  *  Allocate C64 colors
  */
 
@@ -799,7 +819,7 @@ void C64Display::InitColors(uint8 *color
  *  Show a requester (error message)
  */
 
-long int ShowRequester(char *a,char *b,char *)
+long int ShowRequester(const char *a, const char *b, const char *)
 {
 	printf("%s: %s\n", a, b);
 	return 1;