diff mbox

[FFmpeg-devel] cmdutils: check for SetDllDirectory() availability

Message ID 20160819050141.7504-1-jamrial@gmail.com
State Superseded, archived
Headers show

Commit Message

James Almer Aug. 19, 2016, 5:01 a.m. UTC
It's only available on Windows XP or newer.

Should fix compilation with mingw32 using the default OS target.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 cmdutils.c | 2 +-
 configure  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

Comments

Hendrik Leppkes Aug. 19, 2016, 8:55 a.m. UTC | #1
On Fri, Aug 19, 2016 at 7:01 AM, James Almer <jamrial@gmail.com> wrote:
> It's only available on Windows XP or newer.

We don't support anything older.

- Hendrik
James Almer Aug. 19, 2016, 2:19 p.m. UTC | #2
On 8/19/2016 5:55 AM, Hendrik Leppkes wrote:
> On Fri, Aug 19, 2016 at 7:01 AM, James Almer <jamrial@gmail.com> wrote:
>> It's only available on Windows XP or newer.
> 
> We don't support anything older.
> 
> - Hendrik

Then why aren't we forcing -D_WIN32_WINNT=0x0502 as a minimum during
configure for mingw32 targets, like we're doing for MSVC?
Right now a simple ./configure for that target is broken, as you can
see in FATE.
diff mbox

Patch

diff --git a/cmdutils.c b/cmdutils.c
index 6960f8c..a725e77 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -109,7 +109,7 @@  static void log_callback_report(void *ptr, int level, const char *fmt, va_list v
 
 void init_dynload(void)
 {
-#ifdef _WIN32
+#if HAVE_SETDLLDIRECTORY
     /* Calling SetDllDirectory with the empty string (but not NULL) removes the
      * current working directory from the DLL search path as a security pre-caution. */
     SetDllDirectory("");
diff --git a/configure b/configure
index 9b92426..4afe4e5 100755
--- a/configure
+++ b/configure
@@ -1937,6 +1937,7 @@  SYSTEM_FUNCS="
     sched_getaffinity
     SetConsoleTextAttribute
     SetConsoleCtrlHandler
+    SetDllDirectory
     setmode
     setrlimit
     Sleep
@@ -5492,6 +5493,7 @@  check_func_headers windows.h MapViewOfFile
 check_func_headers windows.h PeekNamedPipe
 check_func_headers windows.h SetConsoleTextAttribute
 check_func_headers windows.h SetConsoleCtrlHandler
+check_func_headers windows.h SetDllDirectory
 check_func_headers windows.h Sleep
 check_func_headers windows.h VirtualAlloc
 check_struct windows.h "CONDITION_VARIABLE" Ptr