bumped Xcode projects to version 4.7. Added a new Xcode project for the STXSaxDriver.

[sope] / sope-appserver / NGObjWeb / WOSession.m

diff --git a/sope-appserver/NGObjWeb/WOSession.m b/sope-appserver/NGObjWeb/WOSession.m
index f0e8f745f83438da1a0ec42aa99176ee85b877ea..692c228cda6f87aa594c7dc3d7a48a51918a4be6 100644 (file)
--- a/sope-appserver/NGObjWeb/WOSession.m
+++ b/sope-appserver/NGObjWeb/WOSession.m
@@ -28,8 +28,9 @@
 #include <NGObjWeb/WORequest.h>
 #include <NGObjWeb/WOResponse.h>
 #include <NGObjWeb/WOStatisticsStore.h>
-#include <EOControl/EONull.h>
+#import <EOControl/EONull.h>
 #include "common.h"
+#include <string.h>
 
 #if APPLE_FOUNDATION_LIBRARY || NeXT_Foundation_LIBRARY
 @interface NSObject(Miss)
@@ -249,8 +250,8 @@ static Class NSDateClass = Nil;
         page = entry->page;
         if (logPageCache) {
           [self debugWithFormat:@"restored permanent page %@ for ctx %@",
-                  page ? [page name] : (id)@"<nil>",
-                  _contextID ? _contextID : (id)@"<nil>"];
+                  page       != nil ? [page name] : (NSString *)@"<nil>",
+                 _contextID != nil ? _contextID  : (NSString *)@"<nil>"];
         }
         break;
       }
@@ -271,7 +272,7 @@ static Class NSDateClass = Nil;
       if ([_contextID isEqualToString:entry->contextID]) {
         page = entry->page;
         if (logPageCache) {
-          [self debugWithFormat:@"restored page %@<0x%08X> for ctx %@",
+          [self debugWithFormat:@"restored page %@<0x%p> for ctx %@",
                   [page name], page, _contextID];
         }
         break;
@@ -661,7 +662,7 @@ static Class NSDateClass = Nil;
 /* description */
 
 - (NSString *)description {
-  return [NSString stringWithFormat:@"<%@[0x%08X]: id=%@>",
+  return [NSString stringWithFormat:@"<%@[0x%p]: id=%@>",
                      NSStringFromClass([self class]), self,
                      [self sessionID]];
 }