fixed some 64bit issues

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1296 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/NGObjWeb/GNUmakefile.preamble b/sope-appserver/NGObjWeb/GNUmakefile.preamble
index 631196816e8cc459a9bf10fe8b47a9cb00af2d36..aa96278c5651cfa4256fccf4eb24fd90d6943edd 100644 (file)
--- a/sope-appserver/NGObjWeb/GNUmakefile.preamble
+++ b/sope-appserver/NGObjWeb/GNUmakefile.preamble
@@ -50,7 +50,11 @@ ADDITIONAL_LIB_DIRS += \
        $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
 endif
 
+ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64)
+SYSTEM_LIB_DIR += -L/usr/local/lib64 -L/usr/lib64
+else
 SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+endif
 
 
 # dependencies

diff --git a/sope-appserver/NGObjWeb/OWResourceManager.m b/sope-appserver/NGObjWeb/OWResourceManager.m
index 33687f2a7dbac538881378f5baa891bce260fb8a..c99f7f2259c890ed4f8d5109a474553d287d7b2a 100644 (file)
--- a/sope-appserver/NGObjWeb/OWResourceManager.m
+++ b/sope-appserver/NGObjWeb/OWResourceManager.m
@@ -129,10 +129,10 @@ _pathExists(OWResourceManager *self, NSFileManager *fm, NSString *path)
   if (self->existingPathes && (path != nil)) {
     int i;
     
-    i = (int)NSMapGet(self->existingPathes, path);
+    i = (int)(long)NSMapGet(self->existingPathes, path);
     if (i == 0) {
       doesExist = [fm fileExistsAtPath:path];
-      NSMapInsert(self->existingPathes, path, (void*)(doesExist ? 1 : 0xFF));
+      NSMapInsert(self->existingPathes, path, (void*)(doesExist ? 1L : 0xFFL));
     }
     else
       doesExist = i == 1 ? YES : NO;

diff --git a/sope-appserver/NGObjWeb/WOContext.m b/sope-appserver/NGObjWeb/WOContext.m
index 6b0d2ad2bdea715c8ab2d97b99ad25757aa8f1fa..1b08905714c11bcb38125af53de59abf160276f1 100644 (file)
--- a/sope-appserver/NGObjWeb/WOContext.m
+++ b/sope-appserver/NGObjWeb/WOContext.m
@@ -102,7 +102,8 @@ static NSString *WOApplicationSuffix = nil;
     char buf[24];
     self->qpJoin = @"&";
     
-    sprintf(buf, "%03x%08x%08x", ++contextCount, (int)time(NULL), (int)self);
+    sprintf(buf, "%03x%08x%08x", ++contextCount, (int)time(NULL),
+           (unsigned int)(unsigned long)self);
     self->ctxId = [[NSString alloc] initWithCString:buf];
     
     /* per default close tags in XML style */
@@ -669,7 +670,7 @@ void WOContext_leaveComponent(WOContext *self, WOComponent *_component) {
   
   return [NSString stringWithFormat:
                      @"<0x%p[%@]: %@ app=%@ sn=%@ eid=%@ rqeid=%@>",
-                     (unsigned)self, NSStringFromClass([self class]),
+                     self, NSStringFromClass([self class]),
                      [self  contextID],
                      [app name],
                     sid != nil ? sid : (NSString *)@"none",

diff --git a/sope-appserver/NGObjWeb/WOResourceManager.m b/sope-appserver/NGObjWeb/WOResourceManager.m
index aab0c25b39058b1765c71101a7524d10677058af..b47396dc1c3d0f2c603c6ca89905556b25db99ab 100644 (file)
--- a/sope-appserver/NGObjWeb/WOResourceManager.m
+++ b/sope-appserver/NGObjWeb/WOResourceManager.m
@@ -122,10 +122,11 @@ _pathExists(WOResourceManager *self, NSFileManager *fm, NSString *path)
   if (self->existingPathes && (path != nil)) {
     int i;
     
-    i = (int)NSMapGet(self->existingPathes, path);
+    i = (int)(long)NSMapGet(self->existingPathes, path);
     if (i == 0) {
       doesExist = [fm fileExistsAtPath:path];
-      NSMapInsert(self->existingPathes, path, (void*)(doesExist ? 1 : 0xFF));
+      NSMapInsert(self->existingPathes, path,
+                 (void *)(doesExist ? 1L : 0xFFL));
     }
     else
       doesExist = i == 1 ? YES : NO;