[SCM] thin, simple and robust network communication layer on top of UDP branch, master, updated. debian/1.2-4-7-gcb0f822

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit d2347064d599db476ae3704c89b4d7babc60ae53
Author: Ansgar Burchardt <ansgar at 43-1.org>
Date:   Wed Dec 30 14:21:14 2009 +0900

    refresh patch
    
    Refresh patch for new upstream release.
    
    Signed-off-by: Ansgar Burchardt <ansgar at 43-1.org>

diff --git a/debian/patches/kfreebsd.diff b/debian/patches/kfreebsd.diff
index b388091..4ccffeb 100644
--- a/debian/patches/kfreebsd.diff
+++ b/debian/patches/kfreebsd.diff
@@ -2,16 +2,14 @@ From: Gonéri Le Bouder <goneri at rulezlan.org>
 Subject: Fix FTBFS on GNU/kFreeBSD
 
 See http://bugs.debian.org/414348
-Index: enet-1.1/unix.c
-===================================================================
---- enet-1.1.orig/unix.c	2007-09-16 21:12:45.000000000 +0000
-+++ enet-1.1/unix.c	2007-09-16 21:13:52.000000000 +0000
+--- enet.orig/unix.c
++++ enet/unix.c
 @@ -80,7 +80,7 @@
      char buffer [2048];
      int errnum;
  
--#if defined(linux) || defined(__FreeBSD__)
-+#if defined(linux) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+-#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__)
++#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
      gethostbyname_r (name, & hostData, buffer, sizeof (buffer), & hostEntry, & errnum);
  #else
      hostEntry = gethostbyname_r (name, & hostData, buffer, sizeof (buffer), & errnum);
@@ -19,8 +17,8 @@ Index: enet-1.1/unix.c
  
      in.s_addr = address -> host;
  
--#if defined(linux) || defined(__FreeBSD__)
-+#if defined(linux) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+-#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__)
++#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
      gethostbyaddr_r ((char *) & in, sizeof (struct in_addr), AF_INET, & hostData, buffer, sizeof (buffer), & hostEntry, & errnum);
  #else
      hostEntry = gethostbyaddr_r ((char *) & in, sizeof (struct in_addr), AF_INET, & hostData, buffer, sizeof (buffer), & errnum);

-- 
thin, simple and robust network communication layer on top of UDP