From db375713bb7b41dc693a1a3b51727e70d829cd82 Mon Sep 17 00:00:00 2001
From: Alexei Svitkine <alexei.svitkine@gmail.com>
Date: Sat, 26 Dec 2015 02:17:08 -0500
Subject: [PATCH] Fix CrossPlatform files for SheepShaver build and a warning.

---
 BasiliskII/src/CrossPlatform/sigsegv.cpp |  3 ++-
 SheepShaver/src/Unix/Makefile.in         | 11 ++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/BasiliskII/src/CrossPlatform/sigsegv.cpp b/BasiliskII/src/CrossPlatform/sigsegv.cpp
index d83b7536..570058c2 100644
--- a/BasiliskII/src/CrossPlatform/sigsegv.cpp
+++ b/BasiliskII/src/CrossPlatform/sigsegv.cpp
@@ -71,9 +71,10 @@ static sigsegv_fault_handler_t sigsegv_fault_handler = 0;
 // Function called to dump state if we can't handle the fault
 static sigsegv_state_dumper_t sigsegv_state_dumper = 0;
 
+#if defined(HAVE_SIGINFO_T) || defined(HAVE_SIGCONTEXT_SUBTERFUGE)
 // Actual SIGSEGV handler installer
 static bool sigsegv_do_install_handler(int sig);
-
+#endif
 
 /*
  *  Instruction decoding aids
diff --git a/SheepShaver/src/Unix/Makefile.in b/SheepShaver/src/Unix/Makefile.in
index 9bb39077..ad3c46bd 100644
--- a/SheepShaver/src/Unix/Makefile.in
+++ b/SheepShaver/src/Unix/Makefile.in
@@ -17,7 +17,7 @@ CC = @CC@
 CXX = @CXX@
 CFLAGS = @CFLAGS@
 CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@ -I../include -I. -I../slirp
+CPPFLAGS = @CPPFLAGS@ -I../include -I. -I../CrossPlatform -I../slirp
 DEFS = @DEFS@ -D_REENTRANT -DDATADIR=\"$(datadir)/$(APP)\"
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -49,6 +49,8 @@ GUI_SRCS = ../prefs.cpp prefs_unix.cpp prefs_editor_gtk.cpp ../prefs_items.cpp \
 	../user_strings.cpp user_strings_unix.cpp xpram_unix.cpp sys_unix.cpp rpc_unix.cpp \
 	../dummy/prefs_dummy.cpp
 
+XPLAT_SRCS = ../CrossPlatform/vm_alloc.cpp ../CrossPlatform/sigsegv.cpp ../CrossPlatform/video_blit.cpp
+
 # Append disassembler to dyngen, if available
 ifneq (:no,$(MONSRCS):$(USE_DYNGEN))
 DYNGENSRCS += $(filter %i386-dis.c,$(MONSRCS))
@@ -59,11 +61,10 @@ SRCS = ../main.cpp main_unix.cpp ../prefs.cpp ../prefs_items.cpp prefs_unix.cpp
     ../rom_patches.cpp ../rsrc_patches.cpp ../emul_op.cpp ../name_registry.cpp \
     ../macos_util.cpp ../timer.cpp timer_unix.cpp ../xpram.cpp xpram_unix.cpp \
     ../adb.cpp ../sony.cpp ../disk.cpp ../cdrom.cpp ../scsi.cpp \
-    ../gfxaccel.cpp ../video.cpp video_blit.cpp ../audio.cpp ../ether.cpp ../thunks.cpp \
+    ../gfxaccel.cpp ../video.cpp ../audio.cpp ../ether.cpp ../thunks.cpp \
     ../serial.cpp ../extfs.cpp disk_sparsebundle.cpp tinyxml2.cpp \
-    about_window_unix.cpp ../user_strings.cpp user_strings_unix.cpp \
-    vm_alloc.cpp sigsegv.cpp rpc_unix.cpp \
-    sshpty.c strlcpy.c $(SYSSRCS) $(CPUSRCS) $(MONSRCS) $(SLIRP_SRCS)
+    about_window_unix.cpp ../user_strings.cpp user_strings_unix.cpp rpc_unix.cpp \
+    sshpty.c strlcpy.c $(XPLAT_SRCS) $(SYSSRCS) $(CPUSRCS) $(MONSRCS) $(SLIRP_SRCS)
 APP = SheepShaver
 APP_EXE = $(APP)$(EXEEXT)
 APP_APP = $(APP).app