From bf8446462b4a34b5bb7eada33f0440d3a5e470c4 Mon Sep 17 00:00:00 2001 From: Fred Kiefer Date: Fri, 21 Aug 2009 13:57:16 +0000 Subject: [PATCH] * Source/NSBitmapImageRep+ICNS.m: Redefine icns_size_t to int, as this needs to be a 32 bit integer and on 64 bit systems long uses 64 bits. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@28501 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 ++++++ Source/NSBitmapImageRep+ICNS.m | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c0582c88b..3929ffe9e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-08-21 Fred Kiefer + + * Source/NSBitmapImageRep+ICNS.m: Redefine icns_size_t to int, as + this needs to be a 32 bit integer and on 64 bit systems long uses + 64 bits. + 2009-08-19 00:57-EDT Gregory John Casamento * Source/NSTextView.m: Don't add the text storage if it's nil diff --git a/Source/NSBitmapImageRep+ICNS.m b/Source/NSBitmapImageRep+ICNS.m index 548d761e0..3af69263d 100644 --- a/Source/NSBitmapImageRep+ICNS.m +++ b/Source/NSBitmapImageRep+ICNS.m @@ -55,7 +55,8 @@ */ typedef unsigned char icns_byte_t; -typedef unsigned long icns_size_t; +// must be a 32 bit integer +typedef unsigned int icns_size_t; typedef struct _icns_type_t { char c[4]; } icns_type_t;