From 6580d5e377cf7a54589fd7dcb6c754ef271ad8d5 Mon Sep 17 00:00:00 2001
From: Måns Rullgård <mans@mansr.com>
Date: Sun, 7 Mar 2010 22:18:37 +0000
Subject: Remove hacks not required since HAVE_AV_CONFIG_H was unset for the
 apps

Originally committed as revision 22295 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 cmdutils.c | 2 --
 ffmpeg.c   | 3 ---
 ffplay.c   | 4 ----
 ffprobe.c  | 1 -
 ffserver.c | 3 ---
 5 files changed, 13 deletions(-)

diff --git a/cmdutils.c b/cmdutils.c
index f1edc685ed..a4306d04d1 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -46,8 +46,6 @@
 #include <sys/resource.h>
 #endif
 
-#undef exit
-
 const char **opt_names;
 static int opt_name_count;
 AVCodecContext *avcodec_opts[CODEC_TYPE_NB];
diff --git a/ffmpeg.c b/ffmpeg.c
index 25f4558f89..d5deacce9d 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -66,7 +66,6 @@
 #elif HAVE_CONIO_H
 #include <conio.h>
 #endif
-#undef time //needed because HAVE_AV_CONFIG_H is defined on top
 #include <time.h>
 
 #include "cmdutils.h"
@@ -74,8 +73,6 @@
 #undef NDEBUG
 #include <assert.h>
 
-#undef exit
-
 const char program_name[] = "FFmpeg";
 const int program_birth_year = 2000;
 
diff --git a/ffplay.c b/ffplay.c
index 3c9c379dd7..bfe10bebd1 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -47,10 +47,6 @@
 #undef main /* We don't want SDL to override our main() */
 #endif
 
-#undef exit
-#undef printf
-#undef fprintf
-
 const char program_name[] = "FFplay";
 const int program_birth_year = 2003;
 
diff --git a/ffprobe.c b/ffprobe.c
index 512777ccb9..b6ac061010 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#undef HAVE_AV_CONFIG_H
 #include "libavformat/avformat.h"
 #include "libavcodec/avcodec.h"
 #include "libavcodec/opt.h"
diff --git a/ffserver.c b/ffserver.c
index 41081c3975..d7e4def6d4 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -47,7 +47,6 @@
 #endif
 #include <errno.h>
 #include <sys/time.h>
-#undef time //needed because HAVE_AV_CONFIG_H is defined on top
 #include <time.h>
 #include <sys/wait.h>
 #include <signal.h>
@@ -57,8 +56,6 @@
 
 #include "cmdutils.h"
 
-#undef exit
-
 const char program_name[] = "FFserver";
 const int program_birth_year = 2000;
 
-- 
cgit v1.2.3