MSVC: resolve near/far issue take2
Previous fix failed w/ compositor, tested on MSVC2015, full build.
This commit is contained in:
parent
598216c36e
commit
b59b812400
@ -54,9 +54,13 @@ struct GPUFX;
|
||||
|
||||
/* ******************************** */
|
||||
|
||||
/* The near/far thing is a Win EXCEPTION. Thus, leave near/far in the
|
||||
* code, and patch for windows. */
|
||||
|
||||
/* The near/far thing is a Win EXCEPTION, caused by indirect includes from <windows.h>.
|
||||
* Thus, leave near/far in the code, and undef for windows. */
|
||||
#ifdef _WIN32
|
||||
# undef near
|
||||
# undef far
|
||||
#endif
|
||||
|
||||
/* Background Picture in 3D-View */
|
||||
typedef struct BGpic {
|
||||
struct BGpic *next, *prev;
|
||||
|
@ -34,10 +34,8 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
# include <windows.h>
|
||||
# undef near
|
||||
# undef far
|
||||
#endif
|
||||
|
||||
#include "MEM_guardedalloc.h"
|
||||
|
Loading…
Reference in New Issue
Block a user