Drop apache 1 build-dependency

[sope] / sope-core / NGExtensions / common.h

diff --git a/sope-core/NGExtensions/common.h b/sope-core/NGExtensions/common.h
index 633a9423f9207f095cce1b95cde65d0546d1c9aa..45ae44a2f213d8bd0cecbd768e7045545df6e819 100644 (file)
--- a/sope-core/NGExtensions/common.h
+++ b/sope-core/NGExtensions/common.h
@@ -1,20 +1,20 @@
 /*
-  Copyright (C) 2000-2004 SKYRIX Software AG
+  Copyright (C) 2000-2005 SKYRIX Software AG
 
-  This file is part of OpenGroupware.org.
+  This file is part of SOPE.
 
-  OGo is free software; you can redistribute it and/or modify it under
+  SOPE is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
   Free Software Foundation; either version 2, or (at your option) any
   later version.
 
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  SOPE is distributed in the hope that it will be useful, but WITHOUT ANY
   WARRANTY; without even the implied warranty of MERCHANTABILITY or
   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
   License for more details.
 
   You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
+  License along with SOPE; see the file COPYING.  If not, write to the
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
@@ -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