From 15b019e40adb1fdc25f7ba1aca8f473619d07ae7 Mon Sep 17 00:00:00 2001 From: Timo Rothenpieler Date: Wed, 15 Nov 2017 19:15:23 +0100 Subject: avcodec/nvenc: fix double defined GUID on cygwin --- compat/nvenc/nvEncodeAPI.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'compat') diff --git a/compat/nvenc/nvEncodeAPI.h b/compat/nvenc/nvEncodeAPI.h index c3a8294..e662880 100644 --- a/compat/nvenc/nvEncodeAPI.h +++ b/compat/nvenc/nvEncodeAPI.h @@ -77,7 +77,7 @@ extern "C" { typedef RECT NVENC_RECT; #else // ========================================================================================= -#ifndef GUID +#if !defined(GUID) && !defined(GUID_DEFINED) /*! * \struct GUID * Abstracts the GUID structure for non-windows platforms. -- cgit v1.1