This makes linking succeed for tools that include config.h but
don't link to libavutil.
---
 configure            |    5 -----
 libavutil/internal.h |    5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index d165e68..2b370e9 100755
--- a/configure
+++ b/configure
@@ -4089,11 +4089,6 @@ fi
 
 enabled getenv || echo "#define getenv(x) NULL" >> $TMPH
 
-if enabled msvc && ! enabled shared; then
-    echo '#pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_strtod")' >> 
$TMPH
-    echo '#pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_snprintf")' 
>> $TMPH
-fi
-
 print_config ARCH_   "$config_files" $ARCH_LIST
 print_config HAVE_   "$config_files" $HAVE_LIST
 print_config CONFIG_ "$config_files" $CONFIG_LIST       \
diff --git a/libavutil/internal.h b/libavutil/internal.h
index 5f4b060..49534d4 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -111,6 +111,11 @@
 
 #include "libm.h"
 
+#if defined(_MSC_VER) && !CONFIG_SHARED
+#pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_strtod")
+#pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_snprintf")
+#endif
+
 /**
  * Return NULL if CONFIG_SMALL is true, otherwise the argument
  * without modification. Used to disable the definition of strings
-- 
1.7.9.4

_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to