Skip to content

Commit 2ce8bd6

Browse files
committed
gl_format: Fix duplicate definition
1 parent f77c86f commit 2ce8bd6

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
@@ -90,11 +90,13 @@ static inline void glGetFormatSize( const GLenum internalFormat, GlFormatSize *
9090
#include <assert.h>
9191

9292
#if defined(_WIN32)
93+
#ifndef NOMINMAX
9394
#define NOMINMAX
94-
#ifndef __cplusplus
95+
#endif
96+
#if defined(_MSC_VER) && !defined(__cplusplus)
9597
#undef inline
9698
#define inline __inline
97-
#endif // __cplusplus
99+
#endif // defined(_MSC_VER) && !defined(__cplusplus)
98100
#endif
99101

100102
typedef unsigned int GLenum;

0 commit comments

Comments
 (0)