Skip to content

Commit 1d597d8

Browse files
committed
gl_format: Fix duplicate definition
1 parent c412259 commit 1d597d8

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

external/include/GL/gl_format.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,13 @@ static inline void glGetFormatSize( const GLenum internalFormat, GlFormatSize *
9292
#include <assert.h>
9393

9494
#if defined(_WIN32)
95+
#ifndef NOMINMAX
9596
#define NOMINMAX
96-
#ifndef __cplusplus
97+
#endif
98+
#if defined(_MSC_VER) && !defined(__cplusplus)
9799
#undef inline
98100
#define inline __inline
99-
#endif // __cplusplus
101+
#endif // defined(_MSC_VER) && !defined(__cplusplus)
100102
#endif
101103

102104
typedef unsigned int GLenum;

0 commit comments

Comments
 (0)