From cb45553f577f8e0ebfe05d3287e1b6fa5859b967 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Sat, 20 Oct 2012 15:22:41 +0200
Subject: Remove pointless #undefs of previously forbidden functions.

---
 libavformat/network.c        | 2 --
 libavformat/output-example.c | 2 --
 libavformat/seek-test.c      | 3 ---
 libavformat/url-test.c       | 3 ---
 libavformat/utils.c          | 2 --
 5 files changed, 12 deletions(-)

(limited to 'libavformat')

diff --git a/libavformat/network.c b/libavformat/network.c
index fe17bdf2eb..1f6bc10995 100644
--- a/libavformat/network.c
+++ b/libavformat/network.c
@@ -57,8 +57,6 @@ static unsigned long openssl_thread_id(void)
 #if HAVE_THREADS && GNUTLS_VERSION_NUMBER <= 0x020b00
 #include <gcrypt.h>
 #include <errno.h>
-#undef malloc
-#undef free
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
 #endif
 #endif
diff --git a/libavformat/output-example.c b/libavformat/output-example.c
index e4babb49a5..2f83990011 100644
--- a/libavformat/output-example.c
+++ b/libavformat/output-example.c
@@ -38,8 +38,6 @@
 #include "libavformat/avformat.h"
 #include "libswscale/swscale.h"
 
-#undef exit
-
 /* 5 seconds stream duration */
 #define STREAM_DURATION   5.0
 #define STREAM_FRAME_RATE 25 /* 25 images/s */
diff --git a/libavformat/seek-test.c b/libavformat/seek-test.c
index 57d3fa4da5..143f0b5ace 100644
--- a/libavformat/seek-test.c
+++ b/libavformat/seek-test.c
@@ -28,9 +28,6 @@
 #include "libavutil/mathematics.h"
 #include "libavformat/avformat.h"
 
-#undef printf
-#undef fprintf
-
 static char buffer[20];
 
 static const char *ret_str(int v)
diff --git a/libavformat/url-test.c b/libavformat/url-test.c
index 58258e502a..6639ccf7b8 100644
--- a/libavformat/url-test.c
+++ b/libavformat/url-test.c
@@ -20,9 +20,6 @@
 
 #include "internal.h"
 
-#undef printf
-#undef exit
-
 static void test(const char *base, const char *rel)
 {
     char buf[200], buf2[200];
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 481760b5ad..12b054d935 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3092,7 +3092,6 @@ static void hex_dump_internal(void *avcl, FILE *f, int level,
                               const uint8_t *buf, int size)
 {
     int len, i, j, c;
-#undef fprintf
 #define PRINT(...) do { if (!f) av_log(avcl, level, __VA_ARGS__); else fprintf(f, __VA_ARGS__); } while(0)
 
     for(i=0;i<size;i+=16) {
@@ -3130,7 +3129,6 @@ void av_hex_dump_log(void *avcl, int level, const uint8_t *buf, int size)
 
 static void pkt_dump_internal(void *avcl, FILE *f, int level, AVPacket *pkt, int dump_payload, AVRational time_base)
 {
-#undef fprintf
 #define PRINT(...) do { if (!f) av_log(avcl, level, __VA_ARGS__); else fprintf(f, __VA_ARGS__); } while(0)
     PRINT("stream #%d:\n", pkt->stream_index);
     PRINT("  keyframe=%d\n", ((pkt->flags & AV_PKT_FLAG_KEY) != 0));
-- 
cgit v1.2.3