From patchwork Wed Jan 8 11:30:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 17250 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3052B44ABD3 for ; Wed, 8 Jan 2020 13:38:41 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0631A68A485; Wed, 8 Jan 2020 13:38:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f65.google.com (mail-lf1-f65.google.com [209.85.167.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DBF6768A485 for ; Wed, 8 Jan 2020 13:38:33 +0200 (EET) Received: by mail-lf1-f65.google.com with SMTP id l18so2220927lfc.1 for ; Wed, 08 Jan 2020 03:38:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=KZP7nuB/iFI2SEg8s4hgGdvczPwNgaimObV7PgOlT0g=; b=g7tr0r8x7BD6OANumWoNWd46uPLkY3Am7RBEEX8Y1MJ05KDw1lGyJmvlGRV91ExsL5 pB/XXSCwmJCKKzoUdfxfW44JCGGB+gosgb1h446njpn8smxyV1ixlOgY8BwLXhkjZLGs NuDlt47G/E7cXaNcrtoBxI5n/uMtv42TUQ9ftSPlPLjuSOUSQvW8t4ThmHivL8olefGM ICj86N9v6tUFQi749K0Ek+W3ok/eA9TWfUaCY19uxkNcpWmfyaWvYjSF3N6ini+qgRlN pzPwlPDGyzX/enYXZzlfJL5v6qLFRhsVR/9t+9hx4zhh++gNm7QSVqE8qVU8EIdo/qX6 FtXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=KZP7nuB/iFI2SEg8s4hgGdvczPwNgaimObV7PgOlT0g=; b=QPTyIPRimN3+94vQCvagEBai86swW2wU/UlFS3QTsm3KnBcc7SFYPNrasJYAYFaGwX BCKYJOiGOgz8+70emxcKhvWTsVrrpr0ECmW+AUJdCGG5CHu7k5wdYD6fuepOuZU5c4Pk /mHqDFNemAzgVssHgxVJfBrahAumzi4bHxN5BI5suDFK+SPF6bioznahSWw7oIPe4N5L sd07MDNmx+tnkv03aypP1EPMGkyBEOpGkVf+7Dotu1phrtgX8F3Q1YrT0Oe0y18TztkD Zc37meKkz3ivA6wf7X0atcAFmBSWWwV8bXbUnxo8eTt933dmZ0+NEEe7NDerZq3d1evB 4hDg== X-Gm-Message-State: APjAAAU60BGBhFtB9UICu7NR0zKml0NaQxdKHjbHi3Y+xqsvTYuvlbpH QpJUjCGR/gkEaRmjPJo7QZHgY+zgPP0= X-Google-Smtp-Source: APXvYqxqBxoe+snuhjs+0pKDjG/kWkTCXn0sSqGL1UNZfdvyme4VVdV43u5kzqSQ/lkI6qvFtVs9sg== X-Received: by 2002:a05:6512:244:: with SMTP id b4mr2513643lfo.85.1578483047859; Wed, 08 Jan 2020 03:30:47 -0800 (PST) Received: from localhost (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id b17sm1227671lfp.15.2020.01.08.03.30.47 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 08 Jan 2020 03:30:47 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Jan 2020 13:30:46 +0200 Message-Id: <20200108113046.40707-1-martin@martin.st> X-Mailer: git-send-email 2.21.0 (Apple Git-122.2) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] cmdutils: Fix compilation on cygwin wrt SetDllDirectory and GetModuleHandle X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" After 06ec9c4746ebc1d3b613c1847e434bbd0b4407b4 we check for these functions in configure (which will succeed in cygwin), but cmdutils.c only includes windows.h if _WIN32 is defined (which it isn't in cygwin). Retain the old intent from before 06ec9c4746ebc1d3b613c1847e434bbd0b4407b4, that these functions only would be used when _WIN32 is defined, while only using them if configure has agreed that they do exist. --- fftools/cmdutils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index e4f4861d66..7954f23430 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -119,7 +119,7 @@ static void log_callback_report(void *ptr, int level, const char *fmt, va_list v void init_dynload(void) { -#if HAVE_SETDLLDIRECTORY +#if HAVE_SETDLLDIRECTORY && defined(_WIN32) /* 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(""); @@ -2039,7 +2039,7 @@ FILE *get_preset_file(char *filename, size_t filename_size, av_strlcpy(filename, preset_name, filename_size); f = fopen(filename, "r"); } else { -#if HAVE_GETMODULEHANDLE +#if HAVE_GETMODULEHANDLE && defined(_WIN32) char datadir[MAX_PATH], *ls; base[2] = NULL;