From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Mon, 3 Dec 2007 16:11:06 +0000 (+0000)
Subject: added a 10.5 hack
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbb83e5b86a6226555df68f55bfacd572bbec47c;p=sope

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 e6f6b1cd..5b4da489 100644
--- 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 2bfa4622..755c90e1 100644
--- 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 d124b50f..5a9103fb 100644
--- a/sope-core/NGStreams/Version
+++ b/sope-core/NGStreams/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=53
+SUBMINOR_VERSION:=54