From 5c73a98827bd072c6f5b2ef71f40a36509474c3e Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 19 Apr 2015 04:18:50 +0000 Subject: [PATCH] Remove !__cplusplus directives --- common/include/pstypes.h | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/common/include/pstypes.h b/common/include/pstypes.h index 260dcf0e1..65f139780 100644 --- a/common/include/pstypes.h +++ b/common/include/pstypes.h @@ -52,27 +52,6 @@ typedef unsigned int uint; #ifdef _MSC_VER # include // this is where min and max are defined #endif -#ifndef __cplusplus -#ifndef min -#define min(a,b) (((a)>(b))?(b):(a)) -#endif -#ifndef max -#define max(a,b) (((a)<(b))?(b):(a)) -#endif - -#ifndef PATH_MAX -#define PATH_MAX 4096 -#endif - -#ifndef bool -//define a boolean -typedef ubyte bool; -#endif - -#ifndef NULL -#define NULL 0 -#endif -#endif // the following stuff has nothing to do with types but needed everywhere, // and since this file is included everywhere, it's here.