From f863daabed0bdbdda250c856066e3fce453232e0 Mon Sep 17 00:00:00 2001
From: Christian Weisgerber <naddy@FreeBSD.org>
Date: Sat, 30 Nov 2002 00:53:57 +0000
Subject: Fix build on -CURRENT.

Notified by:	bento
---
 emulators/frodo/files/patch-CmdPipe.cpp  | 15 +++++++++++++--
 emulators/frodo/files/patch-Display.h    | 14 ++++++++++++++
 emulators/frodo/files/patch-Display__x.i | 14 ++++++++++++++
 emulators/frodo/files/patch-SAM.cpp      | 23 +++++++++++++++++++++++
 4 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 emulators/frodo/files/patch-Display.h
 create mode 100644 emulators/frodo/files/patch-Display__x.i
 create mode 100644 emulators/frodo/files/patch-SAM.cpp

(limited to 'emulators/frodo')

diff --git a/emulators/frodo/files/patch-CmdPipe.cpp b/emulators/frodo/files/patch-CmdPipe.cpp
index 280950748743..cc32fba3b77e 100644
--- a/emulators/frodo/files/patch-CmdPipe.cpp
+++ b/emulators/frodo/files/patch-CmdPipe.cpp
@@ -1,6 +1,17 @@
+
+$FreeBSD$
+
 --- CmdPipe.cpp.orig	Wed Aug  6 20:56:26 1997
-+++ CmdPipe.cpp	Sat Mar 10 19:19:59 2001
-@@ -16,9 +16,11 @@
++++ CmdPipe.cpp	Sat Nov 30 01:29:18 2002
+@@ -9,16 +9,18 @@
+ 
+ 
+ extern "C" {
+-	#include <string.h>
++	#include <stdlib.h>
+ 	#include <unistd.h>
+ 	#include <sys/wait.h>
+ 	#include <sys/types.h>
  	#include <string.h>
  	#include <signal.h>
  
diff --git a/emulators/frodo/files/patch-Display.h b/emulators/frodo/files/patch-Display.h
new file mode 100644
index 000000000000..a32c38608da5
--- /dev/null
+++ b/emulators/frodo/files/patch-Display.h
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- Display.h.orig	Sat Nov 30 01:14:14 2002
++++ Display.h	Sat Nov 30 01:14:37 2002
+@@ -112,7 +112,7 @@
+ 
+ #ifdef __unix
+ 	void draw_led(int num, int state);	// Draw one LED
+-	static void pulse_handler(...);		// LED error blinking
++	static void pulse_handler(int sig);	// LED error blinking
+ #endif
+ 
+ #ifdef WIN32
diff --git a/emulators/frodo/files/patch-Display__x.i b/emulators/frodo/files/patch-Display__x.i
new file mode 100644
index 000000000000..6e49fc6a5bf7
--- /dev/null
+++ b/emulators/frodo/files/patch-Display__x.i
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- Display_x.i.orig	Sat Nov 30 01:11:07 2002
++++ Display_x.i	Sat Nov 30 01:11:41 2002
+@@ -525,7 +525,7 @@
+  *  LED error blink
+  */
+ 
+-void C64Display::pulse_handler(...)
++void C64Display::pulse_handler(int sig)
+ {
+ 	for (int i=0; i<4; i++)
+ 		switch (c64_disp->led_state[i]) {
diff --git a/emulators/frodo/files/patch-SAM.cpp b/emulators/frodo/files/patch-SAM.cpp
new file mode 100644
index 000000000000..ce8029e296a9
--- /dev/null
+++ b/emulators/frodo/files/patch-SAM.cpp
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- SAM.cpp.orig	Sat Nov 30 01:25:40 2002
++++ SAM.cpp	Sat Nov 30 01:26:38 2002
+@@ -205,7 +205,7 @@
+ 
+ // Prototypes
+ static void error(char *s);
+-static void handle_abort(...);
++static void handle_abort(int sig);
+ static void init_abort(void);
+ static void exit_abort(void);
+ static bool aborted(void);
+@@ -470,7 +470,7 @@
+ struct sigaction my_sa;
+ #endif
+ 
+-static void handle_abort(...)
++static void handle_abort(int sig)
+ {
+ 	WasAborted = true;
+ #if !defined(HAVE_SIGACTION) && defined(HAVE_SIGNAL)
-- 
cgit v1.2.3