summaryrefslogtreecommitdiff
path: root/editors/openoffice.org-3/files/patch-i66666
blob: 68f8018ead53cd6372e98bbc8f5edc1d16684fa0 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
it also includes the following patch
http://www.go-oo.org/patches/64bit/sixtyfour-warnings-fpicker.diff
from i66686 (dupe of i66666)
Index: tools/inc/solar.h
===================================================================
RCS file: /cvs/util/tools/inc/solar.h,v
retrieving revision 1.44
diff -u -r1.44 solar.h
--- tools/inc/solar.h	26 Apr 2006 20:42:59 -0000	1.44
+++ tools/inc/solar.h	23 Jun 2006 13:32:04 -0000
@@ -55,9 +55,6 @@
 #define FALSE		0
 #endif
 
-#undef NULL
-#define NULL		0
-
 #ifdef _SOLAR__PRIVATE
 #undef _SOLAR__PRIVATE
 #endif