[ros-roscpp-core] 03/05: Remove patch, merged upstream

[Jochen Sprickerhof]

This is an automated email from the git hooks/post-receive script.

jspricke pushed a commit to annotated tag debian/0.6.6-1
in repository ros-roscpp-core.

commit b164c443950d3b8ec755a698500c8334f67d48a8
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sat Oct 28 10:14:16 2017 +0200

    Remove patch, merged upstream
---
 .../0003-Only-use-Apple-features-on-Apple.patch    | 48 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 49 deletions(-)

diff --git a/debian/patches/0003-Only-use-Apple-features-on-Apple.patch b/debian/patches/0003-Only-use-Apple-features-on-Apple.patch
deleted file mode 100644
index ff0b02e..0000000
--- a/debian/patches/0003-Only-use-Apple-features-on-Apple.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Tue, 26 Sep 2017 10:14:10 +0200
-Subject: Only use Apple features on Apple
-
-GNU Mach set's __MACH__ a well, but doesn't provide the interface.
----
- rostime/src/time.cpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/rostime/src/time.cpp b/rostime/src/time.cpp
-index d08c92c..5b85071 100644
---- a/rostime/src/time.cpp
-+++ b/rostime/src/time.cpp
-@@ -46,10 +46,10 @@
- #include <limits>
- 
- // time related includes for macOS
--#if defined(__MACH__)
-+#if defined(__APPLE__)
- #include <mach/clock.h>
- #include <mach/mach.h>
--#endif  // defined(__MACH__)
-+#endif  // defined(__APPLE__)
- 
- #include <boost/thread/mutex.hpp>
- #include <boost/io/ios_state.hpp>
-@@ -188,7 +188,7 @@ namespace ros
-   {
- #ifndef WIN32
-     timespec start;
--#if defined(__MACH__)
-+#if defined(__APPLE__)
-     // On macOS use clock_get_time.
-     clock_serv_t cclock;
-     mach_timespec_t mts;
-@@ -197,10 +197,10 @@ namespace ros
-     mach_port_deallocate(mach_task_self(), cclock);
-     start.tv_sec = mts.tv_sec;
-     start.tv_nsec = mts.tv_nsec;
--#else  // defined(__MACH__)
-+#else  // defined(__APPLE__)
-     // Otherwise use clock_gettime.
-     clock_gettime(CLOCK_MONOTONIC, &start);
--#endif  // defined(__MACH__)
-+#endif  // defined(__APPLE__)
-     sec  = start.tv_sec;
-     nsec = start.tv_nsec;
- #else
diff --git a/debian/patches/series b/debian/patches/series
index 7221243..c4a5f1f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-Add-CMakeLists.txt.patch
 0002-Add-Debian-specific-SONAMEs.patch
-0003-Only-use-Apple-features-on-Apple.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-roscpp-core.git