aboutsummaryrefslogtreecommitdiff
path: root/graphics/Pixie/Pixie.patch
blob: c434175d9523d45168c080d99e7a8f409af72272 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
--- Pixie/src/common/mathSpec.h.orig	2017-07-05 02:13:02.301256099 +0700
+++ Pixie/src/common/mathSpec.h	2017-07-05 02:12:40.349255850 +0700
@@ -7,6 +7,9 @@
 
 
 
+#define min(a,b) ((a)<(b)?(a):(b))
+#define max(a,b) ((a)>(b)?(a):(b))
+
 inline	void	initv(SCALAR_TYPE *r,const SCALAR_TYPE x) {
 	r[0]	=	x;
 	r[1]	=	x;
--- Pixie/src/common/containers.h.orig	2017-07-05 02:14:23.367257020 +0700
+++ Pixie/src/common/containers.h	2017-07-05 02:15:14.528257601 +0700
@@ -50,7 +50,8 @@
 
 
 
-
+#define min(a,b) ((a)<(b)?(a):(b))
+#define max(a,b) ((a)>(b)?(a):(b))
 
 ///////////////////////////////////////////////////////////////////////
 // Class				:	CDictionary
--- Pixie/src/ri/memory.h.orig	2017-07-05 02:18:00.590259487 +0700
+++ Pixie/src/ri/memory.h	2017-07-05 02:18:11.143259607 +0700
@@ -36,6 +36,9 @@
 
 #include <string.h>
 
+#define min(a,b) ((a)<(b)?(a):(b))
+#define max(a,b) ((a)>(b)?(a):(b))
+
 ///////////////////////////////////////////////////////////////////////
 // Class				:	CMemPage
 // Description			:	This class coltains memory that's allocated on the fly
--- Pixie/src/ri/occlusion.h.orig	2017-07-05 02:23:25.745263181 +0700
+++ Pixie/src/ri/occlusion.h	2017-07-05 02:23:35.920263297 +0700
@@ -34,6 +34,9 @@
 #include "common/global.h"
 #include "common/os.h"
 
+#define min(a,b) ((a)<(b)?(a):(b))
+#define max(a,b) ((a)>(b)?(a):(b))
+
 ///////////////////////////////////////////////////////////////////////
 // Class				:	COcclusionCuller
 // Description			:	The occlusion culler class