Remove pointless #undefs of previously forbidden functions.

15 files changed, 0 insertions, 29 deletions

diff --git a/libavutil/avstring.c b/libavutil/avstring.c
index 6b3a65c7f0..c14832e7b9 100644
--- a/libavutil/avstring.c
+++ b/libavutil/avstring.c
@@ -159,7 +159,6 @@ int av_strncasecmp(const char *a, const char *b, size_t n)
 #ifdef TEST
 
 #include "common.h"
-#undef printf
 
 int main(void)
 {
diff --git a/libavutil/base64.c b/libavutil/base64.c
index c1fba897be..d16195f1b9 100644
--- a/libavutil/base64.c
+++ b/libavutil/base64.c
@@ -101,8 +101,6 @@ char *av_base64_encode(char *out, int out_size, const uint8_t *in, int in_size)
 
 #ifdef TEST
 
-#undef printf
-
 #define MAX_DATA_SIZE    1024
 #define MAX_ENCODED_SIZE 2048
 
diff --git a/libavutil/blowfish.c b/libavutil/blowfish.c
index e6f07d6ad0..63cc4043ff 100644
--- a/libavutil/blowfish.c
+++ b/libavutil/blowfish.c
@@ -428,7 +428,6 @@ void av_blowfish_crypt(AVBlowfish *ctx, uint8_t *dst, const uint8_t *src,
 
 #ifdef TEST
 #include <stdio.h>
-#undef printf
 
 #define NUM_VARIABLE_KEY_TESTS 34
 
@@ -531,7 +530,6 @@ static const uint8_t ciphertext2[16] = {
 
 #define IV "blowfish"
 
-#undef exit
 static void test_blowfish(AVBlowfish *ctx, uint8_t *dst, const uint8_t *src,
                           const uint8_t *ref, int len, uint8_t *iv, int dir,
                           const char *test)
diff --git a/libavutil/cpu.c b/libavutil/cpu.c
index 8db69be24e..23016d68a9 100644
--- a/libavutil/cpu.c
+++ b/libavutil/cpu.c
@@ -111,7 +111,6 @@ int av_parse_cpu_flags(const char *s)
 
 #ifdef TEST
 
-#undef printf
 #include <stdio.h>
 
 static const struct {
diff --git a/libavutil/crc.c b/libavutil/crc.c
index 47520e5cf4..3d1d876037 100644
--- a/libavutil/crc.c
+++ b/libavutil/crc.c
@@ -113,7 +113,6 @@ uint32_t av_crc(const AVCRC *ctx, uint32_t crc,
 }
 
 #ifdef TEST
-#undef printf
 int main(void)
 {
     uint8_t buf[1999];
diff --git a/libavutil/des.c b/libavutil/des.c
index c7c6f1dbee..01cb10b359 100644
--- a/libavutil/des.c
+++ b/libavutil/des.c
@@ -337,9 +337,6 @@ void av_des_mac(AVDES *d, uint8_t *dst, const uint8_t *src, int count) {
 }
 
 #ifdef TEST
-#undef printf
-#undef rand
-#undef srand
 #include <stdlib.h>
 #include <stdio.h>
 #include "libavutil/time.h"
diff --git a/libavutil/eval.c b/libavutil/eval.c
index 7a28dbe12d..7887cf6b0e 100644
--- a/libavutil/eval.c
+++ b/libavutil/eval.c
@@ -545,7 +545,6 @@ int av_expr_parse_and_eval(double *d, const char *s,
 }
 
 #ifdef TEST
-#undef printf
 #include <string.h>
 
 static const double const_values[] = {
diff --git a/libavutil/fifo.c b/libavutil/fifo.c
index 5774d33d25..26848999ec 100644
--- a/libavutil/fifo.c
+++ b/libavutil/fifo.c
@@ -130,8 +130,6 @@ void av_fifo_drain(AVFifoBuffer *f, int size)
 
 #ifdef TEST
 
-#undef printf
-
 int main(void)
 {
     /* create a FIFO buffer */
diff --git a/libavutil/log.c b/libavutil/log.c
index 45c649aae6..80129769f6 100644
--- a/libavutil/log.c
+++ b/libavutil/log.c
@@ -55,7 +55,6 @@ static const uint8_t color[] = { 0x41, 0x41, 0x11, 0x03, 9, 0x02, 0x06 };
 #endif
 static int use_color = -1;
 
-#undef fprintf
 static void colored_fputs(int level, const char *str)
 {
     if (use_color < 0) {
@@ -104,7 +103,6 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl)
     if (level > av_log_level)
         return;
     line[0] = 0;
-#undef fprintf
     if (print_prefix && avc) {
         if (avc->parent_log_context_offset) {
             AVClass** parent = *(AVClass ***) (((uint8_t *) ptr) +
diff --git a/libavutil/md5.c b/libavutil/md5.c
index 93a91d7812..efb993e605 100644
--- a/libavutil/md5.c
+++ b/libavutil/md5.c
@@ -182,7 +182,6 @@ void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len)
 }
 
 #ifdef TEST
-#undef printf
 #include <stdio.h>
 
 static void print_md5(uint8_t *md5)
diff --git a/libavutil/mem.c b/libavutil/mem.c
index b6c0b29319..3a4433d154 100644
--- a/libavutil/mem.c
+++ b/libavutil/mem.c
@@ -38,11 +38,6 @@
 #include "intreadwrite.h"
 #include "mem.h"
 
-/* here we can use OS-dependent allocation functions */
-#undef free
-#undef malloc
-#undef realloc
-
 #ifdef MALLOC_PREFIX
 
 #define malloc         AV_JOIN(MALLOC_PREFIX, malloc)
diff --git a/libavutil/opt.c b/libavutil/opt.c
index 61a72d0a40..d2cb9ef95a 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -685,8 +685,6 @@ const AVClass *av_opt_child_class_next(const AVClass *parent, const AVClass *pre
 
 #ifdef TEST
 
-#undef printf
-
 typedef struct TestContext
 {
     const AVClass *class;
diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c
index 28aa9c9521..917451eee7 100644
--- a/libavutil/parseutils.c
+++ b/libavutil/parseutils.c
@@ -498,7 +498,6 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration)
     char lastch;
     int negative = 0;
 
-#undef time
     time_t now = time(0);
 
     len = strlen(timestr);
@@ -643,8 +642,6 @@ int av_find_info_tag(char *arg, int arg_size, const char *tag1, const char *info
 
 #ifdef TEST
 
-#undef printf
-
 int main(void)
 {
     printf("Testing av_parse_video_rate()\n");
diff --git a/libavutil/sha.c b/libavutil/sha.c
index d5831915c4..c7c6ce38cf 100644
--- a/libavutil/sha.c
+++ b/libavutil/sha.c
@@ -334,7 +334,6 @@ void av_sha_final(AVSHA* ctx, uint8_t *digest)
 
 #ifdef TEST
 #include <stdio.h>
-#undef printf
 
 int main(void)
 {
diff --git a/libavutil/xtea.c b/libavutil/xtea.c
index f3357ce544..1187662eb2 100644
--- a/libavutil/xtea.c
+++ b/libavutil/xtea.c
@@ -101,7 +101,6 @@ void av_xtea_crypt(AVXTEA *ctx, uint8_t *dst, const uint8_t *src, int count,
 
 #ifdef TEST
 #include <stdio.h>
-#undef printf
 
 #define XTEA_NUM_TESTS 6
 
@@ -138,7 +137,6 @@ static const uint8_t xtea_test_ct[XTEA_NUM_TESTS][8] = {
     { 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41 }
 };
 
-#undef exit
 static void test_xtea(AVXTEA *ctx, uint8_t *dst, const uint8_t *src,
                       const uint8_t *ref, int len, uint8_t *iv, int dir,
                       const char *test)