[Ffmpeg-cvslog] r7018 - in trunk: configure ffserver.c libavformat/framehook.c

[mru]

Author: mru
Date: Tue Nov 14 00:14:24 2006
New Revision: 7018

Modified:
   trunk/configure
   trunk/ffserver.c
   trunk/libavformat/framehook.c

Log:
rename CONFIG_HAVE_DLFCN and CONFIG_HAVE_DLOPEN to HAVE_DLFCN/HAVE_DLOPEN


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Tue Nov 14 00:14:24 2006
@@ -1972,11 +1972,11 @@
 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

Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c	(original)
+++ trunk/ffserver.c	Tue Nov 14 00:14:24 2006
@@ -37,7 +37,7 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <signal.h>
-#ifdef CONFIG_HAVE_DLFCN
+#ifdef HAVE_DLFCN
 #include <dlfcn.h>
 #endif
 
@@ -3706,7 +3706,7 @@
 
 /* simplistic plugin support */
 
-#ifdef CONFIG_HAVE_DLOPEN
+#ifdef HAVE_DLOPEN
 static void load_module(const char *filename)
 {
     void *dll;
@@ -4377,7 +4377,7 @@
             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",

Modified: trunk/libavformat/framehook.c
==============================================================================
--- trunk/libavformat/framehook.c	(original)
+++ trunk/libavformat/framehook.c	Tue Nov 14 00:14:24 2006
@@ -23,7 +23,7 @@
 #include "avformat.h"
 #include "framehook.h"
 
-#ifdef CONFIG_HAVE_DLFCN
+#ifdef HAVE_DLFCN
 #include <dlfcn.h>
 #endif