fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 16:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vbo: avoid including wingdi.h on win32

Browse source 
On Windows, main/glheader.h ends up including windows.h which in turn
includes wingdi.h unless the NOGDI macro is defined. And wingdi.h
defines a macro called "ERROR", which we end up redefining below.

To avoid a warning on the redefinition, we can define NOGDI to prevent
wingdi.h from implicitly being included.

Reviewed-by: Brian Paul <brianp@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4577>
This commit is contained in:
Erik Faye-Lund 2020-04-15 22:48:46 +02:00 • committed by Marge Bot
parent b55b033f76
commit 0752648a99
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/mesa/vbo/vbo_noop.c
View file

@ -28,6 +28,9 @@
* GLvertexformat no-op functions. Used in out-of-memory situations.
*/
#ifdef _WIN32
#define NOGDI
#endif
#include "main/glheader.h"
#include "main/context.h"