History

hwcontext_vulkan: fix CreateSemaphore conflict with synchapi.h

Include windows.h to fix it. Normally, it'd be better to include it in vulkan_functions.h, but I'm reasonably confident nothing else that uses the Vulkan code will need to include Windows functions and not windows.h.

Lynne committed 5 years ago

Commit 296cb991 parent 57e11321 file · +7 −6Browse files

Unified · Split

libavutil/hwcontext_vulkan.c+7−6
@@ -19,6 +19,13 @@ · 18 unmodified lines
19#define VK_NO_PROTOTYPES19#define VK_NO_PROTOTYPES
20#define VK_ENABLE_BETA_EXTENSIONS20#define VK_ENABLE_BETA_EXTENSIONS
21 21
22#ifdef _WIN32
23#include <windows.h> /* Included to prevent conflicts with CreateSemaphore */
24#include "compat/w32dlfcn.h"
25#else
26#include <dlfcn.h>
27#endif
28
22#include <unistd.h>29#include <unistd.h>
23 30
24#include "config.h"31#include "config.h"
@@ -32,12 +39,6 @@ · 7 unmodified lines
32 39
33#include "vulkan_loader.h"40#include "vulkan_loader.h"
34 41
35#ifdef _WIN32
36#include "compat/w32dlfcn.h"
37#else
38#include <dlfcn.h>
39#endif
40
41#if CONFIG_LIBDRM42#if CONFIG_LIBDRM
42#include <xf86drm.h>43#include <xf86drm.h>
43#include <drm_fourcc.h>44#include <drm_fourcc.h>

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t