From fe552d3b3aaf34666382a201092b1f8df7d69359 Mon Sep 17 00:00:00 2001 From: helge Date: Mon, 2 May 2005 23:33:54 +0000 Subject: [PATCH] fixed gcc 4.0/tiger warnings git-svn-id: http://svn.opengroupware.org/SOPE/trunk@791 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/NGObjWeb/ChangeLog | 7 +++++++ sope-appserver/NGObjWeb/DynamicElements/WOImage.m | 5 +++++ sope-appserver/NGObjWeb/DynamicElements/WOString.m | 5 +++++ .../NGObjWeb/DynamicElements/_WOTemporaryHyperlink.m | 5 +++++ sope-appserver/NGObjWeb/NGHttp/ChangeLog | 4 ++++ sope-appserver/NGObjWeb/NGHttp/common.h | 1 - sope-appserver/NGObjWeb/Version | 2 +- sope-appserver/NGObjWeb/WOWatchDogApplicationMainOSX.m | 2 +- 8 files changed, 28 insertions(+), 3 deletions(-) diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index 3c116ffb..0ba0e286 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,5 +1,12 @@ 2005-05-03 Helge Hess + * v4.5.158 + + * WOWatchDogApplicationMainOSX.m: fixed a gcc 4.0 warning + + * NGHttp, WOImage.m, WOString.m, _WOTemporaryHyperlink.m: fixed Tiger + warnings + * Templates/WOApplication+Builders.m: fixed an uninitialized variable on Cocoa (v4.5.157) diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOImage.m b/sope-appserver/NGObjWeb/DynamicElements/WOImage.m index 7d81b4b9..69e4725e 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOImage.m +++ b/sope-appserver/NGObjWeb/DynamicElements/WOImage.m @@ -393,6 +393,11 @@ abort(); #endif return; + +#if __APPLE__ + // make Tiger GCC happy + [super dealloc]; +#endif } @end /* _WOTemporaryImage */ diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOString.m b/sope-appserver/NGObjWeb/DynamicElements/WOString.m index fc9c9d03..6a53f427 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOString.m +++ b/sope-appserver/NGObjWeb/DynamicElements/WOString.m @@ -779,6 +779,11 @@ static inline Class _classForConfig(NSDictionary *_config) { abort(); #endif return; + +#if __APPLE__ + // make Tiger GCC happy + [super dealloc]; +#endif } @end /* _WOTemporaryString */ diff --git a/sope-appserver/NGObjWeb/DynamicElements/_WOTemporaryHyperlink.m b/sope-appserver/NGObjWeb/DynamicElements/_WOTemporaryHyperlink.m index 01d9fb29..f5a8df35 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/_WOTemporaryHyperlink.m +++ b/sope-appserver/NGObjWeb/DynamicElements/_WOTemporaryHyperlink.m @@ -148,6 +148,11 @@ static Class _WODirectActionHyperlinkClass = Nil; abort(); #endif return; + +#if __APPLE__ + // make Tiger GCC happy + [super dealloc]; +#endif } @end /* _WOTemporaryHyperlink */ diff --git a/sope-appserver/NGObjWeb/NGHttp/ChangeLog b/sope-appserver/NGObjWeb/NGHttp/ChangeLog index afdd5974..4c3a2040 100644 --- a/sope-appserver/NGObjWeb/NGHttp/ChangeLog +++ b/sope-appserver/NGObjWeb/NGHttp/ChangeLog @@ -1,3 +1,7 @@ +2005-05-03 Helge Hess + + * common.h: fixed Tiger warnings + 2004-12-14 Marcus Mueller * NGHttp.xcode: minor changes and updated diff --git a/sope-appserver/NGObjWeb/NGHttp/common.h b/sope-appserver/NGObjWeb/NGHttp/common.h index cafef893..ef3c694c 100644 --- a/sope-appserver/NGObjWeb/NGHttp/common.h +++ b/sope-appserver/NGObjWeb/NGHttp/common.h @@ -30,7 +30,6 @@ #import #import -#import #include #include diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index 010a9867..593980c7 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=157 +SUBMINOR_VERSION:=158 # v4.5.122 requires libNGExtensions v4.5.153 # v4.5.91 requires libNGExtensions v4.5.134 diff --git a/sope-appserver/NGObjWeb/WOWatchDogApplicationMainOSX.m b/sope-appserver/NGObjWeb/WOWatchDogApplicationMainOSX.m index 13118994..8910be0a 100644 --- a/sope-appserver/NGObjWeb/WOWatchDogApplicationMainOSX.m +++ b/sope-appserver/NGObjWeb/WOWatchDogApplicationMainOSX.m @@ -369,7 +369,7 @@ int WOWatchDogApplicationMain /* transform the child into a new process */ { - const unsigned char *p; + const char *p; p = argv[0]; if (p[0] != '/') { -- 2.39.5