[libdispatch-changes] [61] trunk

[source_changes at macosforge.org]

Revision: 61
          http://trac.macosforge.org/projects/libdispatch/changeset/61
Author:   robert at fledge.watson.org
Date:     2009-10-28 01:32:09 -0700 (Wed, 28 Oct 2009)
Log Message:
-----------
Inline fd_copy.h into os_shims.h as it's just one line.

Submitted by:	Paolo Bonzini <bonzini at gnu.org>

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

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

Deleted: trunk/compat/fd_copy.h
===================================================================
--- trunk/compat/fd_copy.h	2009-10-28 08:29:47 UTC (rev 60)
+++ trunk/compat/fd_copy.h	2009-10-28 08:32:09 UTC (rev 61)
@@ -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 __COMPAT_FD_COPY_H__
-#define __COMPAT_FD_COPY_H__
-
-#define	FD_COPY(f, t)	(void)(*(t) = *(f))
-
-#endif /* __COMPAT_FD_COPY_H__ */

Modified: trunk/src/internal.h
===================================================================
--- trunk/src/internal.h	2009-10-28 08:29:47 UTC (rev 60)
+++ trunk/src/internal.h	2009-10-28 08:32:09 UTC (rev 61)
@@ -39,9 +39,6 @@
 #ifdef HAVE_AVAILABILITY_H
 #include <Availability.h>
 #endif
-#if !HAVE_DECL_FD_COPY
-#include <compat/fd_copy.h>
-#endif
 
 #include <dispatch/dispatch.h>
 #include <dispatch/base.h>

Modified: trunk/src/os_shims.h
===================================================================
--- trunk/src/os_shims.h	2009-10-28 08:29:47 UTC (rev 60)
+++ trunk/src/os_shims.h	2009-10-28 08:32:09 UTC (rev 61)
@@ -42,6 +42,10 @@
 __private_extern__ const char *__crashreporter_info__;
 #endif
 
+#if !HAVE_DECL_FD_COPY
+#define	FD_COPY(f, t)	(void)(*(t) = *(f))
+#endif
+
 #include "shims/tsd.h"
 #include "shims/perfmon.h"
 #include "shims/time.h"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/libdispatch-changes/attachments/20091028/bcacb474/attachment.html>