rpms/icu/devel icu-gcc41.patch,NONE,1.1 icu.spec,1.9,1.10

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/icu/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31919

Modified Files:
	icu.spec 
Added Files:
	icu-gcc41.patch 
Log Message:
try this

icu-gcc41.patch:
 putilimp.h |   23 +----------------------
 1 files changed, 1 insertion(+), 22 deletions(-)

--- NEW FILE icu-gcc41.patch ---
--- icu/source/common/putilimp.h.orig	2005-06-30 18:21:58.000000000 -0400
+++ icu/source/common/putilimp.h	2006-01-03 05:51:01.000000000 -0500
@@ -254,26 +254,5 @@
  * @internal
  */
 #ifndef U_MAX_PTR
-#  if defined(OS390) && !defined(_LP64)
-    /* We have 31-bit pointers. */
-#    define U_MAX_PTR(base) ((void *)0x7fffffff)
-#  elif defined(OS400)
-/*
- * With the provided macro we should never be out of range of a given segment
- * (a traditional/typical segment that is).  Our segments have 5 bytes for the id
- * and 3 bytes for the offset.  The key is that the casting takes care of only
- * retrieving the offset portion minus x1000.  Hence, the smallest offset seen in
- * a program is x001000 and when casted to an int would be 0.  That's why we can
- * only add 0xffefff.  Otherwise, we would exceed the segment.
- *
- * Currently, 16MB is the current addressing limitation on as/400.  This macro
- * may eventually be changed to use 2GB addressability for the newer version of
- * as/400 machines.
- */
-#    define U_MAX_PTR(base) ((void *)(((char *)base)-((int32_t)(base))+((int32_t)0xffefff)))
-#  else
-#    define U_MAX_PTR(base) ((void *)(((char *)(base)+0x7fffffffu) > (char *)(base) ? ((char *)(base)+0x7fffffffu) : (char *)-1))
-#  endif
-#endif
-
+#define U_MAX_PTR(base) ((void *)(((uintptr_t)(base)+0x7fffffff) > (uintptr_t)(base) ? ((uintptr_t)(base)+0x7fffffff) : (uintptr_t)-1))
 #endif


Index: icu.spec
===================================================================
RCS file: /cvs/dist/rpms/icu/devel/icu.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- icu.spec	3 Jan 2006 10:30:23 -0000	1.9
+++ icu.spec	3 Jan 2006 10:54:36 -0000	1.10
@@ -11,6 +11,7 @@
 
 BuildRequires:  doxygen
 Patch0: icu-3.4-gnustack.patch
+Patch1: icu-gcc41.patch
 
 %description
 The International Components for Unicode (ICU) libraries provide
@@ -50,6 +51,7 @@
 %prep
 %setup -q -n %{name}
 %patch0 -p1 -b .gnustack
+%patch1 -p1 -b .gcc41
 
 %build
 cd source
@@ -121,8 +123,8 @@
 
 
 %changelog
-* Thu Dec 22 2005 Jesse Keating <jkeating at redhat.com> - 3.4-6
-- rebuilt
+* Tue Jan 03 2005 Caolan McNamara <caolanm at redhat.com> - 3.4-6
+- add icu-gcc41.patch
 
 * Tue Oct 11 2005 Caolan McNamara <caolanm at redhat.com> - 3.4-5
 - clear execstack requirement for libicudata