fix for problem reported by Dave MacLachlan

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/branches/stable@28349 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2009-06-13 07:36:43 +00:00
parent 649a47d266
commit 0833bae975
3 changed files with 9 additions and 3 deletions

View file

@ -1,4 +1,10 @@
009-06-09 Richard Frith-Macdonald <rfm@gnu.org> 2009-06-13 Richard Frith-Macdonald <rfm@gnu.org>
* Headers/Foundation/NSKeyedArchiver.h:
* Headers/Foundation/NSArchiver.h:
Fix error cleaning up a define.
2009-06-09 Richard Frith-Macdonald <rfm@gnu.org>
* SSL/Source/GSSSLHandle.m: Disable v2 by default due to * SSL/Source/GSSSLHandle.m: Disable v2 by default due to
security issues. GSPermitSSLv2 user default can enable it again. security issues. GSPermitSSLv2 user default can enable it again.

View file

@ -164,7 +164,7 @@ extern "C" {
GSIArray objMap; /* Object crossreference map. */ GSIArray objMap; /* Object crossreference map. */
GSIArray ptrMap; /* Pointer crossreference map. */ GSIArray ptrMap; /* Pointer crossreference map. */
#ifndef _IN_NSUNARCHIVER_M #ifndef _IN_NSUNARCHIVER_M
#undef GSUnarchiverArray #undef GSIArray
#endif #endif
unsigned cursor; /* Position in data buffer. */ unsigned cursor; /* Position in data buffer. */
unsigned version; /* Version of archiver used. */ unsigned version; /* Version of archiver used. */

View file

@ -230,7 +230,7 @@ extern "C" {
#endif #endif
GSIArray _objMap; /* Decoded objects. */ GSIArray _objMap; /* Decoded objects. */
#ifndef _IN_NSKEYEDUNARCHIVER_M #ifndef _IN_NSKEYEDUNARCHIVER_M
#undef GSUnarchiverArray #undef GSIArray
#endif #endif
NSZone *_zone; /* Zone for allocating objs. */ NSZone *_zone; /* Zone for allocating objs. */
} }