fixed OGo bug 912

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

diff --git a/sope-core/NGExtensions/ChangeLog b/sope-core/NGExtensions/ChangeLog
index 94055a7b3acc7cc772d39d6c5b1952c264cb023c..3db55f0456d206266968168367c099b89dcca811 100644 (file)
--- a/sope-core/NGExtensions/ChangeLog
+++ b/sope-core/NGExtensions/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-09  Helge Hess  <helge.hess@opengroupware.org>
+
+       * NGExtensions/AutoDefines.h, common.h: fixed defines on MacOSX (fixes
+         OGo bug #912 (v4.5.141)
+
 2004-12-16  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * NGCalendarDateRange.[hm]: new convenience method -containsDateRange:

diff --git a/sope-core/NGExtensions/NGExtensions/AutoDefines.h b/sope-core/NGExtensions/NGExtensions/AutoDefines.h
index 9a82ddca9bbe8527d56f39a23f206bd6cfaebaa0..6578040cacc1371801e6bd1a892cee7777682ab7 100644 (file)
--- a/sope-core/NGExtensions/NGExtensions/AutoDefines.h
+++ b/sope-core/NGExtensions/NGExtensions/AutoDefines.h
@@ -22,20 +22,49 @@
 #ifndef __NGExtensions_AutoDefines_H__
 #define __NGExtensions_AutoDefines_H__
 
+// TODO: can we remove that?
+
 #if defined(__MINGW32__)
 #  define WITH_OPENSTEP 0
 #  define GNUSTEP  1
+
 #elif defined(__CYGWIN32__)
 #  define WITH_OPENSTEP 0
 #  ifndef GNUSTEP
 #    define GNUSTEP 1
 #  endif
+
 #elif defined(NeXT) || defined(WIN32)
 #  define WITH_OPENSTEP 1
 #  define GNUSTEP  0
 #  ifndef NeXT_RUNTIME
 #    define NeXT_RUNTIME 1
 #  endif
+
+#elif defined(__APPLE__)
+#  ifndef WITH_OPENSTEP
+#    define WITH_OPENSTEP 1
+#  endif
+#  if !GNU_RUNTIME
+#    ifndef NeXT_RUNTIME
+#      define NeXT_RUNTIME 1
+#    endif
+#    ifndef APPLE_RUNTIME
+#      define APPLE_RUNTIME 1
+#    endif
+#  endif
+#  if !GNUSTEP_BASE_LIBRARY && !LIB_FOUNDATION_LIBRARY
+#    ifndef COCOA_Foundation_LIBRARY
+#      define COCOA_Foundation_LIBRARY 1
+#    endif
+#    ifndef NeXT_Foundation_LIBRARY
+#      define NeXT_Foundation_LIBRARY 1
+#    endif
+#    ifndef APPLE_Foundation_LIBRARY
+#      define APPLE_Foundation_LIBRARY 1
+#    endif
+#  endif
+
 #else
 #  define WITH_OPENSTEP 0
 #  define GNUSTEP  1

diff --git a/sope-core/NGExtensions/Version b/sope-core/NGExtensions/Version
index c0e8b131e7c773d21d8bc84faf4f2f7bc4f9d87b..6be8e2eddea21b67e142d490bc099ff0346228df 100644 (file)
--- a/sope-core/NGExtensions/Version
+++ b/sope-core/NGExtensions/Version
@@ -1,6 +1,6 @@
 # version
 
-SUBMINOR_VERSION:=140
+SUBMINOR_VERSION:=141
 
 # v4.3.115 requires libFoundation v1.0.59
 # v4.2.72  requires libEOControl  v4.2.39

diff --git a/sope-core/NGExtensions/common.h b/sope-core/NGExtensions/common.h
index af63a2b07c280e2f8e108f5be2a1841ddec42d38..45ae44a2f213d8bd0cecbd768e7045545df6e819 100644 (file)
--- a/sope-core/NGExtensions/common.h
+++ b/sope-core/NGExtensions/common.h
@@ -25,6 +25,8 @@
 #import <Foundation/Foundation.h>
 #import <Foundation/NSMapTable.h>
 
+#include <NGExtensions/AutoDefines.h>
+
 #if defined(WIN32)
 #  include <windows.h>
 #elif defined(NeXT) || NeXT_Foundation_LIBRARY
@@ -37,25 +39,14 @@
 #include <unistd.h>
 #endif
 
-#if defined(__MINGW32__)
-#  define WITH_OPENSTEP 0
-#  define GNUSTEP  1
-#elif defined(NeXT) || defined(WIN32)
-#  define WITH_OPENSTEP 1
-#  define GNUSTEP  0
-#  ifndef NeXT_RUNTIME
-#    define NeXT_RUNTIME 1
-#  endif
-#else
-#  define WITH_OPENSTEP 0
-#  define GNUSTEP  1
+#if GNU_RUNTIME
+#  import <objc/objc-api.h>
+#  import <objc/objc.h>
+#  import <objc/encoding.h>
 #endif
 
 #if LIB_FOUNDATION_LIBRARY
 #  include <time.h>
-#  import <objc/objc-api.h>
-#  import <objc/objc.h>
-#  import <objc/encoding.h>
 #  import <extensions/objc-runtime.h>
 #endif
 
@@ -76,7 +67,7 @@
           object = __value;}})
 #endif
 
-#if defined(LIB_FOUNDATION_LIBRARY)
+#if LIB_FOUNDATION_LIBRARY
 #  define NoZone nil
 #else
 #  define NoZone NULL