projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b55b033) | patch
vbo: avoid including wingdi.h on win32
authorErik Faye-Lund <erik.faye-lund@collabora.com>
Wed, 15 Apr 2020 20:48:46 +0000 (22:48 +0200)
committerMarge Bot <eric+marge@anholt.net>
Thu, 16 Apr 2020 14:48:40 +0000 (14:48 +0000)
commit0752648a993c6f0fae2f4a072079000b9d84d074
treea8553b2be683d97d59353e1b7dcdf2cdbe078a4dtree
parentb55b033f7624171d82ae1f79f3d3ad058ae0ac56commit | diff
vbo: avoid including wingdi.h on win32

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>
src/mesa/vbo/vbo_noop.c diff | blob | history