added a 10.5 hack

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

diff --git a/sope-core/NGStreams/ChangeLog b/sope-core/NGStreams/ChangeLog
index e6f6b1cd57592debb6560ee84d833abff8f1492a..5b4da489a1d5dc9cbed548e06447e48ee95bc84e 100644 (file)
--- a/sope-core/NGStreams/ChangeLog
+++ b/sope-core/NGStreams/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-03  Helge Hess <me@helgehess.eu>
+  
+  * NGTextStream.m: do not use exception handlers in combination with
+    varargs on MacOS >10.5 (v4.7.54)
+
 2007-08-09  Wolfgang Sourdeau  <WSourdeau@Inverse.CA>
 
        * NGInternetSocketAddress.m: properly convert ports returned by

diff --git a/sope-core/NGStreams/NGTextStream.m b/sope-core/NGStreams/NGTextStream.m
index 2bfa46220c707776e7ccb3f7b64dd60ffa818266..755c90e16fedc097c0c482cd37b3c1090513f7f4 100644 (file)
--- a/sope-core/NGStreams/NGTextStream.m
+++ b/sope-core/NGStreams/NGTextStream.m
@@ -153,6 +153,12 @@
 
   va_start(ap, _format);
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED > 1050
+  /* As soon as we add an exception handler on Leopard compilation
+   * breaks. Probably some GCC bug.
+   */
+  res = [self writeFormat:_format arguments:ap];
+#else
   NS_DURING {
     res = [self writeFormat:_format arguments:ap];
   }
@@ -161,6 +167,8 @@
     [localException raise];
   }
   NS_ENDHANDLER;
+#endif
+  
   va_end(ap);
 
   return res;

diff --git a/sope-core/NGStreams/Version b/sope-core/NGStreams/Version
index d124b50f26de387d248a94761fd62b6a22df310b..5a9103fbcfe3a90091d3e23c80df915537dcc5fd 100644 (file)
--- a/sope-core/NGStreams/Version
+++ b/sope-core/NGStreams/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=53
+SUBMINOR_VERSION:=54