From 78e61cc5c6240a3451dc66d02c330febb8ed087b Mon Sep 17 00:00:00 2001 From: =?utf8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Mon, 13 Nov 2006 23:14:24 +0000 Subject: [PATCH] rename CONFIG_HAVE_DLFCN and CONFIG_HAVE_DLOPEN to HAVE_DLFCN/HAVE_DLOPEN Originally committed as revision 7018 to svn://svn.ffmpeg.org/ffmpeg/trunk --- configure | 4 ++-- ffserver.c | 6 +++--- libavformat/framehook.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index faf1cc4..7493ed2 100755 --- a/configure +++ b/configure @@ -1972,11 +1972,11 @@ if test "$dc1394" = "yes" ; then fi if test "$dlopen" = "yes" ; then - echo "#define CONFIG_HAVE_DLOPEN 1" >> $TMPH + echo "#define HAVE_DLOPEN 1" >> $TMPH fi if test "$dlfcn" = "yes" ; then - echo "#define CONFIG_HAVE_DLFCN 1" >> $TMPH + echo "#define HAVE_DLFCN 1" >> $TMPH fi if test "$audio_oss" = "yes" ; then diff --git a/ffserver.c b/ffserver.c index 3c94a28..4100ec2 100644 --- a/ffserver.c +++ b/ffserver.c @@ -37,7 +37,7 @@ #include #include #include -#ifdef CONFIG_HAVE_DLFCN +#ifdef HAVE_DLFCN #include #endif @@ -3706,7 +3706,7 @@ static int opt_video_codec(const char *arg) /* simplistic plugin support */ -#ifdef CONFIG_HAVE_DLOPEN +#ifdef HAVE_DLOPEN static void load_module(const char *filename) { void *dll; @@ -4377,7 +4377,7 @@ static int parse_ffconfig(const char *filename) redirect = NULL; } else if (!strcasecmp(cmd, "LoadModule")) { get_arg(arg, sizeof(arg), &p); -#ifdef CONFIG_HAVE_DLOPEN +#ifdef HAVE_DLOPEN load_module(arg); #else fprintf(stderr, "%s:%d: Module support not compiled into this version: '%s'\n", diff --git a/libavformat/framehook.c b/libavformat/framehook.c index c852961..df1f4b5 100644 --- a/libavformat/framehook.c +++ b/libavformat/framehook.c @@ -23,7 +23,7 @@ #include "avformat.h" #include "framehook.h" -#ifdef CONFIG_HAVE_DLFCN +#ifdef HAVE_DLFCN #include #endif -- 2.7.4