From 2a90e7d7253e8229259ab2c6c57a6000bef0da4a Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Fri, 21 Nov 2025 13:58:22 +0100 Subject: [PATCH] av{codec,util}/tests: Remove pointless undefs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Before commit e96d90eed66a198566c409958432d282e1b03869 lavu/internal.h contained redefined various discouraged/forbidden functions to induce compilation failures upon use, like e.g. #define malloc please_use_av_malloc In order to use these functions, some files had to undefine these macros. This commit removes the remaining pointless undefs. Reviewed-by: Rémi Denis-Courmont Signed-off-by: Andreas Rheinhardt --- libavcodec/jacosubdec.c | 2 -- libavcodec/tests/motion.c | 2 -- libavcodec/tests/snowenc.c | 4 ---- libavfilter/tests/formats.c | 2 -- libavformat/sbgdec.c | 1 - libavutil/file_open.c | 1 - libavutil/tests/bprint.c | 2 -- libavutil/tests/error.c | 2 -- libavutil/tests/file.c | 2 -- libavutil/tests/imgutils.c | 1 - libavutil/tests/pca.c | 1 - libavutil/tests/random_seed.c | 1 - libswresample/tests/swresample.c | 2 -- tools/fourcc2pixfmt.c | 3 --- 14 files changed, 26 deletions(-) diff --git a/libavcodec/jacosubdec.c b/libavcodec/jacosubdec.c index 08349a9ec8..fd90dcc4b6 100644 --- a/libavcodec/jacosubdec.c +++ b/libavcodec/jacosubdec.c @@ -32,8 +32,6 @@ #include "libavutil/bprint.h" #include "libavutil/time_internal.h" -#undef time - static int insert_text(AVBPrint *dst, const char *in, const char *arg) { av_bprintf(dst, "%s", arg); diff --git a/libavcodec/tests/motion.c b/libavcodec/tests/motion.c index 719fba537d..ad2d65ec78 100644 --- a/libavcodec/tests/motion.c +++ b/libavcodec/tests/motion.c @@ -36,8 +36,6 @@ #include "libavutil/mem.h" #include "libavutil/time.h" -#undef printf - #define WIDTH 64 #define HEIGHT 64 diff --git a/libavcodec/tests/snowenc.c b/libavcodec/tests/snowenc.c index 311374e5d4..35feedba06 100644 --- a/libavcodec/tests/snowenc.c +++ b/libavcodec/tests/snowenc.c @@ -20,10 +20,6 @@ #include "libavcodec/snowenc.c" -#undef malloc -#undef free -#undef printf - #include "libavutil/lfg.h" #include "libavutil/mathematics.h" #include "libavutil/mem.h" diff --git a/libavfilter/tests/formats.c b/libavfilter/tests/formats.c index 5cc3ca3371..3fdad7427e 100644 --- a/libavfilter/tests/formats.c +++ b/libavfilter/tests/formats.c @@ -22,8 +22,6 @@ #include "libavfilter/audio.h" #include "libavfilter/formats.c" -#undef printf - const int64_t avfilter_all_channel_layouts[] = { AV_CH_FRONT_CENTER, AV_CH_FRONT_CENTER|AV_CH_LOW_FREQUENCY, diff --git a/libavformat/sbgdec.c b/libavformat/sbgdec.c index 4afb51b844..0e3d860d9f 100644 --- a/libavformat/sbgdec.c +++ b/libavformat/sbgdec.c @@ -905,7 +905,6 @@ static int expand_timestamps(void *log, struct sbg_script *s) av_log(log, AV_LOG_WARNING, "Scripts with mixed absolute and relative timestamps can give " "unexpected results (pause, seeking, time zone change).\n"); -#undef time time(&now0); tm = localtime_r(&now0, &tmpbuf); now = tm ? tm->tm_hour * 3600 + tm->tm_min * 60 + tm->tm_sec : diff --git a/libavutil/file_open.c b/libavutil/file_open.c index 4692035d55..121a562fcb 100644 --- a/libavutil/file_open.c +++ b/libavutil/file_open.c @@ -120,7 +120,6 @@ int avpriv_tempfile(const char *prefix, char **filename, int log_offset, void *l if(!ptr) ptr= tempnam(".", prefix); *filename = av_strdup(ptr); -#undef free free(ptr); #else return AVERROR(ENOSYS); diff --git a/libavutil/tests/bprint.c b/libavutil/tests/bprint.c index d7f9abf23e..9a87283302 100644 --- a/libavutil/tests/bprint.c +++ b/libavutil/tests/bprint.c @@ -21,8 +21,6 @@ #include "libavutil/avassert.h" #include "libavutil/bprint.c" -#undef printf - static void bprint_pascal(AVBPrint *b, unsigned size) { unsigned i, j; diff --git a/libavutil/tests/error.c b/libavutil/tests/error.c index 16efc8ac45..b7b253b7b5 100644 --- a/libavutil/tests/error.c +++ b/libavutil/tests/error.c @@ -18,8 +18,6 @@ #include "libavutil/error.c" -#undef printf - int main(void) { int i; diff --git a/libavutil/tests/file.c b/libavutil/tests/file.c index 3608bcccbe..0b151de9a1 100644 --- a/libavutil/tests/file.c +++ b/libavutil/tests/file.c @@ -18,8 +18,6 @@ #include "libavutil/file.c" -#undef printf - int main(void) { uint8_t *buf; diff --git a/libavutil/tests/imgutils.c b/libavutil/tests/imgutils.c index 6a5097bc35..cd363145ad 100644 --- a/libavutil/tests/imgutils.c +++ b/libavutil/tests/imgutils.c @@ -20,7 +20,6 @@ #include "libavutil/crc.h" #include "libavutil/mem.h" -#undef printf static int check_image_fill(enum AVPixelFormat pix_fmt, int w, int h) { uint8_t *data[4]; size_t sizes[4]; diff --git a/libavutil/tests/pca.c b/libavutil/tests/pca.c index b2afbea3b5..a2a620799a 100644 --- a/libavutil/tests/pca.c +++ b/libavutil/tests/pca.c @@ -22,7 +22,6 @@ #include "libavutil/pca.c" #include "libavutil/lfg.h" -#undef printf #include #include diff --git a/libavutil/tests/random_seed.c b/libavutil/tests/random_seed.c index bf0c6c7986..614c958d42 100644 --- a/libavutil/tests/random_seed.c +++ b/libavutil/tests/random_seed.c @@ -21,7 +21,6 @@ #define TEST 1 #include "libavutil/random_seed.c" -#undef printf #define N 256 #define F 2 #include diff --git a/libswresample/tests/swresample.c b/libswresample/tests/swresample.c index b627aa4ad0..2a5f9d59c4 100644 --- a/libswresample/tests/swresample.c +++ b/libswresample/tests/swresample.c @@ -26,9 +26,7 @@ #include "libswresample/swresample.h" -#undef time #include -#undef fprintf #define SAMPLES 1000 diff --git a/tools/fourcc2pixfmt.c b/tools/fourcc2pixfmt.c index 519cc1cad0..0b107db2ff 100644 --- a/tools/fourcc2pixfmt.c +++ b/tools/fourcc2pixfmt.c @@ -29,9 +29,6 @@ #include "libavcodec/raw.h" #include "libavcodec/raw_pix_fmt_tags.h" -#undef printf -#undef fprintf - #if !HAVE_GETOPT #include "compat/getopt.c" #endif