diff --git a/ChangeLog b/ChangeLog index 7a1bcbedd..4342c2d64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2012-02-28 Richard Frith-Macdonald + + * Source/NSArchiver.m: + * Source/NSUnarchiver.m: + * Source/NSPortCoder.m: + * Version: Update to 12402 + Bump subminor version as suggested by eric Wasylishen, in case there + are any archives which would be caugt by the new version number. + 2012-02-28 Richard Frith-Macdonald * Source/NSArchiver.m: diff --git a/Source/NSArchiver.m b/Source/NSArchiver.m index e017512d3..bc6f2b899 100644 --- a/Source/NSArchiver.m +++ b/Source/NSArchiver.m @@ -267,7 +267,7 @@ static Class NSMutableDataMallocClass; * data and using the eighth (top) bit to indicate that there are more * bytes in the sequence. */ - if ([self systemVersion] >= ((((1 * 100) + 24) * 100) + 1)) + if ([self systemVersion] > 12401) { NSUInteger tmp = count; diff --git a/Source/NSPortCoder.m b/Source/NSPortCoder.m index 5568aa865..84bf17d44 100644 --- a/Source/NSPortCoder.m +++ b/Source/NSPortCoder.m @@ -440,7 +440,7 @@ static IMP _xRefImp; /* Serialize a crossref. */ NSUInteger count; (*_dTagImp)(_src, dTagSel, &info, 0, &_cursor); - if ([self systemVersion] >= ((((1 * 100) + 24) * 100) + 1)) + if (_version > 12401) { uint8_t c; @@ -1147,7 +1147,7 @@ static IMP _xRefImp; /* Serialize a crossref. */ * data and using the eighth (top) bit to indicate that there are more * bytes in the sequence. */ - if ([self systemVersion] >= ((((1 * 100) + 24) * 100) + 1)) + if ([self systemVersion] > 12401) { NSUInteger tmp = count; diff --git a/Source/NSUnarchiver.m b/Source/NSUnarchiver.m index 28c1e8886..085e2330e 100644 --- a/Source/NSUnarchiver.m +++ b/Source/NSUnarchiver.m @@ -536,7 +536,7 @@ static Class NSDataMallocClass; NSUInteger count; (*tagImp)(src, tagSel, &info, 0, &cursor); - if ([self systemVersion] >= ((((1 * 100) + 24) * 100) + 1)) + if (version > 12401) { uint8_t c; diff --git a/Version b/Version index e10970c29..7443e52df 100644 --- a/Version +++ b/Version @@ -7,9 +7,9 @@ GCC_VERSION=4.0.0 # The version number of this release. MAJOR_VERSION=1 MINOR_VERSION=24 -SUBMINOR_VERSION=1 +SUBMINOR_VERSION=2 # numeric value should match above -VERSION_NUMBER=124.1 +VERSION_NUMBER=124.2 GNUSTEP_BASE_VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${SUBMINOR_VERSION} VERSION=${GNUSTEP_BASE_VERSION}