# HG changeset patch
# User arpi
# Date 1002385229 0
# Node ID 3997f8eec36ec899114ce8623398d9e2cff55016
# Parent  7930222ba9769ea5e2c3ca98fbf23f83fa89a1ee
BSD fixes

diff -r 7930222ba976 -r 3997f8eec36e Gui/Makefile
--- a/Gui/Makefile	Sat Oct 06 15:38:56 2001 +0000
+++ b/Gui/Makefile	Sat Oct 06 16:20:29 2001 +0000
@@ -8,7 +8,7 @@
 MPLAYERDIR = mplayer/
 include gui.mak
 
-INCDIR  = -I. -I./event -I./wm -I./skin $(GTKINC)
+INCDIR  = -I. -I./event -I./wm -I./skin $(GTKINC) $(EXTRA_INC)
 
 OPTIMIZE =  $(OPTFLAGS) -fomit-frame-pointer \
             -fexpensive-optimizations -fschedule-insns2 -Wall
diff -r 7930222ba976 -r 3997f8eec36e Gui/mplayer/gtk/fs.h
--- a/Gui/mplayer/gtk/fs.h	Sat Oct 06 15:38:56 2001 +0000
+++ b/Gui/mplayer/gtk/fs.h	Sat Oct 06 16:20:29 2001 +0000
@@ -9,7 +9,7 @@
 #include <glob.h>
 #include <unistd.h>
 
-#if	defined(__SVR4) || defined(__bsdi__)
+#ifndef __linux__
 #define	get_current_dir_name()	getcwd(NULL, PATH_MAX)
 #endif
 
diff -r 7930222ba976 -r 3997f8eec36e Gui/mplayer/psignal.h
--- a/Gui/mplayer/psignal.h	Sat Oct 06 15:38:56 2001 +0000
+++ b/Gui/mplayer/psignal.h	Sat Oct 06 16:20:29 2001 +0000
@@ -39,16 +39,17 @@
 #define mplIncAudioBufferDelay                   28
 #define mplDecAudioBufferDelay                   29
 
+#ifndef SIGTYPE
+#ifdef SIGUSR2
+#define	SIGTYPE SIGUSR2
+#warning should we use SIGUSR1 or SIGUSR2 on linux, bsd, ... too?
+#else
 #ifdef	__bsdi__
 #define	_NSIG NSIG
 #endif
-
-#ifdef	__SVR4
-#define	SIGTYPE SIGUSR2
-#warning should we use SIGUSR1 or SIGUSR2 on linux, bsd, ... too?
-#else
 #define SIGTYPE _NSIG - 1
 #endif
+#endif
 
 extern int gtkIsOk;