summaryrefslogtreecommitdiff
path: root/boost
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2007-06-18 15:35:29 +0000
committerKurt Zenker <kz@openoffice.org>2007-06-18 15:35:29 +0000
commita43c8f012a541ee43410cd2280d874fba64190bd (patch)
tree1aad045acaacbe9f3b38d8aa4267c3603c9bf6f5 /boost
parent40af2b5d6b1d00261be3c4d6638bac83ec73bcc2 (diff)
INTEGRATION: CWS pj81 (1.7.6); FILE MERGED
2007/06/10 13:22:45 pjanik 1.7.6.1: #i72248# prevent inconsistent builds for TARGET_CARBON platforms Patch from hdu, moved from aquavcl01.
Diffstat (limited to 'boost')
-rw-r--r--boost/boost-1.30.2.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/boost/boost-1.30.2.patch b/boost/boost-1.30.2.patch
index 6a42e93f80d0..24aca873278b 100644
--- a/boost/boost-1.30.2.patch
+++ b/boost/boost-1.30.2.patch
@@ -1,3 +1,27 @@
+*** misc/boost-1.30.2/boost/config/platform/macos.hpp Thu Feb 13 13:28:05 2003
+--- misc/build/boost-1.30.2/boost/config/platform/macos.hpp Mon Jun 4 10:01:49 2007
+***************
+*** 19,27 ****
+ # define BOOST_HAS_UNISTD_H
+ # endif
+ // boilerplate code:
+! # ifndef TARGET_CARBON
+ # include <boost/config/posix_features.hpp>
+! # endif
+ # ifndef BOOST_HAS_STDINT_H
+ # define BOOST_HAS_STDINT_H
+ # endif
+--- 19,28 ----
+ # define BOOST_HAS_UNISTD_H
+ # endif
+ // boilerplate code:
+! // HDU: disabled the TARGET_CARBON check because of issue #i72248#
+! //# ifndef TARGET_CARBON
+ # include <boost/config/posix_features.hpp>
+! //# endif
+ # ifndef BOOST_HAS_STDINT_H
+ # define BOOST_HAS_STDINT_H
+ # endif
*** misc/boost-1.30.2/boost/bind.hpp Tue Oct 15 12:51:34 2002
--- misc/build/boost-1.30.2/boost/bind.hpp Tue Jul 25 14:47:06 2006
***************