diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-06 16:20:29 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-06 16:20:29 +0000 |
| commit | 09ee1e1acad9b9e7ce45362160fc8eca502cc86a (patch) | |
| tree | ce6a8dc9ae4fdde953d4447ec0e999c37dbad9c8 /Gui | |
| parent | 136687678e4ac988a0b3cc7306c4b52a192334f4 (diff) | |
| download | mpv-09ee1e1acad9b9e7ce45362160fc8eca502cc86a.tar.bz2 mpv-09ee1e1acad9b9e7ce45362160fc8eca502cc86a.tar.xz | |
BSD fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2113 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
| -rw-r--r-- | Gui/Makefile | 2 | ||||
| -rw-r--r-- | Gui/mplayer/gtk/fs.h | 2 | ||||
| -rw-r--r-- | Gui/mplayer/psignal.h | 11 |
3 files changed, 8 insertions, 7 deletions
diff --git a/Gui/Makefile b/Gui/Makefile index eead879efa..ff0311b74c 100644 --- a/Gui/Makefile +++ b/Gui/Makefile @@ -8,7 +8,7 @@ include bitmap/bitmap.mak 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 --git a/Gui/mplayer/gtk/fs.h b/Gui/mplayer/gtk/fs.h index 21eb043323..0bc7d105f9 100644 --- a/Gui/mplayer/gtk/fs.h +++ b/Gui/mplayer/gtk/fs.h @@ -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 --git a/Gui/mplayer/psignal.h b/Gui/mplayer/psignal.h index 54a492f91c..91b6bf7c94 100644 --- a/Gui/mplayer/psignal.h +++ b/Gui/mplayer/psignal.h @@ -39,16 +39,17 @@ #define mplIncAudioBufferDelay 28 #define mplDecAudioBufferDelay 29 -#ifdef __bsdi__ -#define _NSIG NSIG -#endif - -#ifdef __SVR4 +#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 #define SIGTYPE _NSIG - 1 #endif +#endif extern int gtkIsOk; |