summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-07 12:20:50 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-07 12:20:50 +0000
commite0b1c9a6b772683af9cb2a4f555cec1c5aa56afb (patch)
treecfbb85cfa216f0e80749850c4829308ce024d93f /mplayer.c
parent7377a6a60aad8e52fde392bbb42a41cf96937abe (diff)
downloadmpv-e0b1c9a6b772683af9cb2a4f555cec1c5aa56afb.tar.bz2
mpv-e0b1c9a6b772683af9cb2a4f555cec1c5aa56afb.tar.xz
Give a CONFIG_ prefix to preprocessor directives that lacked one and
change arbitrary prefixes to CONFIG_. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/mplayer.c b/mplayer.c
index e2eb195664..09bec5f97b 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -740,14 +740,14 @@ static void child_sighandler(int x){
}
#endif
-#ifdef CRASH_DEBUG
+#ifdef CONFIG_CRASH_DEBUG
static char *prog_path;
static int crash_debug = 0;
#endif
static void exit_sighandler(int x){
static int sig_count=0;
-#ifdef CRASH_DEBUG
+#ifdef CONFIG_CRASH_DEBUG
if (!crash_debug || x != SIGTRAP)
#endif
++sig_count;
@@ -791,7 +791,7 @@ static void exit_sighandler(int x){
mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGSEGV_SIGFPE);
default:
mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGCRASH);
-#ifdef CRASH_DEBUG
+#ifdef CONFIG_CRASH_DEBUG
if (crash_debug) {
int gdb_pid;
mp_msg(MSGT_CPLAYER, MSGL_INFO, "Forking...\n");
@@ -2895,7 +2895,7 @@ current_module = NULL;
signal(SIGCHLD,child_sighandler);
#endif
-#ifdef CRASH_DEBUG
+#ifdef CONFIG_CRASH_DEBUG
prog_path = argv[0];
#endif
//========= Catch terminate signals: ================
@@ -2907,14 +2907,14 @@ current_module = NULL;
signal(SIGQUIT,exit_sighandler); // Quit from keyboard
signal(SIGPIPE,exit_sighandler); // Some window managers cause this
-#ifdef ENABLE_SIGHANDLER
+#ifdef CONFIG_SIGHANDLER
// fatal errors:
signal(SIGBUS,exit_sighandler); // bus error
signal(SIGSEGV,exit_sighandler); // segfault
signal(SIGILL,exit_sighandler); // illegal instruction
signal(SIGFPE,exit_sighandler); // floating point exc.
signal(SIGABRT,exit_sighandler); // abort()
-#ifdef CRASH_DEBUG
+#ifdef CONFIG_CRASH_DEBUG
if (crash_debug)
signal(SIGTRAP,exit_sighandler);
#endif