[libdispatch-dev] [PATCH 07/17] remove compat/fd_copy.h

[Paolo Bonzini]

There is just one line in this file, so I inline it into
the now easily followed to read src/os_shims.h.
---
 compat/fd_copy.h |   26 --------------------------
 src/internal.h   |    3 ---
 src/os_shims.h   |    4 ++++
 3 files changed, 4 insertions(+), 29 deletions(-)
 delete mode 100644 compat/fd_copy.h

diff --git a/compat/fd_copy.h b/compat/fd_copy.h
deleted file mode 100644
index 63ad9e5..0000000
--- a/compat/fd_copy.h
+++ /dev/null
@@ -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__ */
diff --git a/src/internal.h b/src/internal.h
index 3a3a4ee..3ecb440 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -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>
diff --git a/src/os_shims.h b/src/os_shims.h
index d033a78..170362d 100644
--- a/src/os_shims.h
+++ b/src/os_shims.h
@@ -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"
-- 
1.6.2.5