From deb537c1bb0727a2cd15f3dca41abe2dc5fdd7ab Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sun, 18 Nov 2018 17:52:01 +0300 Subject: [PATCH] common: fix NULL redefine(do we really need NULL definition?) --- engine/common/common.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/engine/common/common.h b/engine/common/common.h index 5c210fc5..32042092 100644 --- a/engine/common/common.h +++ b/engine/common/common.h @@ -103,6 +103,10 @@ XASH SPECIFIC - sort of hack that works only in Xash3D not in GoldSrc #define FBitSet( iBitVector, bit ) ((iBitVector) & (bit)) #ifndef __cplusplus +#ifdef NULL +#undef NULL +#endif + #define NULL ((void *)0) #endif