From ea442fa047819ec2e48a3dbe8ea21959ac3d70b0 Mon Sep 17 00:00:00 2001 From: "Dmitrij D. Czarkoff" Date: Mon, 11 Jan 2016 19:03:40 +0100 Subject: mpv_talloc.h: rename from talloc.h This change helps avoiding conflict with talloc.h from libtalloc. --- video/out/win32/displayconfig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'video/out/win32') diff --git a/video/out/win32/displayconfig.c b/video/out/win32/displayconfig.c index 635e8b6b36..cc91450b75 100644 --- a/video/out/win32/displayconfig.c +++ b/video/out/win32/displayconfig.c @@ -22,7 +22,7 @@ #include "displayconfig.h" -#include "talloc.h" +#include "mpv_talloc.h" // Some DisplayConfig definitions are broken in mingw-w64 (as of 2015-3-13.) To // get the correct struct alignment, it's necessary to define them properly. -- cgit v1.2.3