[Pkg-voip-commits] [twinkle] 01/01: Fix conflicting definition of socklen_t on GNU Hurd

[Peter Colberg]

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

pc-guest pushed a commit to branch master
in repository twinkle.

commit 0da8b8625a5aa9c01ab0012b9b5d521b4b5da981
Author: Peter Colberg <peter at colberg.org>
Date:   Tue Jan 5 21:58:27 2016 -0500

    Fix conflicting definition of socklen_t on GNU Hurd
---
 debian/changelog                                     |  1 +
 ...licting-definition-of-socklen_t-on-gnu-hurd.patch | 20 ++++++++++++++++++++
 debian/patches/series                                |  1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a98639d..60d49fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ twinkle (1:1.9.0+dfsg-3) UNRELEASED; urgency=medium
   * Set Maintainer field to Debian VoIP Team.
   * Add myself to Uploaders field.
   * Update Vcs-Git and Vcs-Browser fields.
+  * Fix conflicting definition of socklen_t on GNU Hurd.
 
  -- Peter Colberg <peter at colberg.org>  Tue, 05 Jan 2016 19:48:23 -0500
 
diff --git a/debian/patches/fix-conflicting-definition-of-socklen_t-on-gnu-hurd.patch b/debian/patches/fix-conflicting-definition-of-socklen_t-on-gnu-hurd.patch
new file mode 100644
index 0000000..30f07ad
--- /dev/null
+++ b/debian/patches/fix-conflicting-definition-of-socklen_t-on-gnu-hurd.patch
@@ -0,0 +1,20 @@
+Description: Fix conflicting definition of socklen_t on GNU Hurd
+ GNU Hurd and OS X both define __MACH__.
+ .
+ Test for __APPLE__ to differentiate between GNU Hurd and OS X.
+Author: Peter Colberg <peter at colberg.org>
+Forwarded: not-needed
+Last-Update: 2015-12-30
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/stun/udp.h
++++ b/src/stun/udp.h
+@@ -2,7 +2,7 @@
+ #define udp_h
+ 
+ 
+-#ifdef __MACH__
++#if defined(__APPLE__) && defined(__MACH__)
+ typedef int socklen_t;
+ #endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 1b7bf13..d57fbc4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ historyform-resize-columns-to-contents.patch
 historyform-clear-rows-before-loading-history.patch
 historyform-disable-editing.patch
 historyform-show-call-details-of-current-item.patch
+fix-conflicting-definition-of-socklen_t-on-gnu-hurd.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/twinkle.git