[libdispatch-changes] [39] trunk

[source_changes at macosforge.org]

Revision: 39
          http://trac.macosforge.org/projects/libdispatch/changeset/39
Author:   robert at fledge.watson.org
Date:     2009-09-25 01:44:52 -0700 (Fri, 25 Sep 2009)
Log Message:
-----------
Because dispatch.h is a publicly included header, we can't rely on
compat/Availability.h being available.  Instead, provide a conditional
definition of __OSX_AVAILABLE_STARTING in dispatch.h.

Modified Paths:
--------------
    trunk/dispatch/dispatch.h
    trunk/src/internal.h

Removed Paths:
-------------
    trunk/compat/Availability.h

Deleted: trunk/compat/Availability.h
===================================================================
--- trunk/compat/Availability.h	2009-09-18 09:57:17 UTC (rev 38)
+++ trunk/compat/Availability.h	2009-09-25 08:44:52 UTC (rev 39)
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2009 Apple Inc. All rights reserved.
- *
- * @APPLE_APACHE_LICENSE_HEADER_START@
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * @APPLE_APACHE_LICENSE_HEADER_END@
- */
-
-#ifndef __AVAILABILITY_H__
-#define __AVAILABILITY_H__
-
-#define	__OSX_AVAILABLE_STARTING(x, y)
-
-#endif /* __AVAILABILITY_H__ */

Modified: trunk/dispatch/dispatch.h
===================================================================
--- trunk/dispatch/dispatch.h	2009-09-18 09:57:17 UTC (rev 38)
+++ trunk/dispatch/dispatch.h	2009-09-25 08:44:52 UTC (rev 39)
@@ -30,6 +30,10 @@
 #include <stdbool.h>
 #include <stdarg.h>
 
+#ifndef __OSX_AVAILABLE_STARTING
+#define	__OSX_AVAILABLE_STARTING(x, y)
+#endif
+
 #define DISPATCH_API_VERSION 20090501
 
 #ifndef __DISPATCH_BUILDING_DISPATCH__

Modified: trunk/src/internal.h
===================================================================
--- trunk/src/internal.h	2009-09-18 09:57:17 UTC (rev 38)
+++ trunk/src/internal.h	2009-09-25 08:44:52 UTC (rev 39)
@@ -38,8 +38,6 @@
 
 #ifdef HAVE_AVAILABILITY_H
 #include <Availability.h>
-#else
-#include <compat/Availability.h>
 #endif
 #ifndef HAVE_PRIVATE_EXTERN
 #include <compat/private_extern.h>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/libdispatch-changes/attachments/20090925/0225b09c/attachment.html>