17 lines
420 B
Diff
17 lines
420 B
Diff
--- x11/compiler.h.old 2018-02-02 17:00:29.174895866 +0000
|
|
+++ x11/compiler.h 2018-02-02 17:00:41.199160781 +0000
|
|
@@ -117,12 +117,14 @@
|
|
#define MAX_PATH MAXPATHLEN
|
|
#endif
|
|
|
|
+#ifndef __cplusplus
|
|
#ifndef max
|
|
#define max(a,b) (((a) > (b)) ? (a) : (b))
|
|
#endif
|
|
#ifndef min
|
|
#define min(a,b) (((a) < (b)) ? (a) : (b))
|
|
#endif
|
|
+#endif /* __cplusplus */
|
|
|
|
#ifndef ZeroMemory
|
|
#define ZeroMemory(d,n) memset((d), 0, (n))
|