[Pkg-voip-commits] r9707 - in /libcommoncpp2/trunk/debian: changelog patches/caddr.diff patches/series

[msp at alioth.debian.org]

Author: msp
Date: Sun May 20 02:18:37 2012
New Revision: 9707

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9707
Log:
Fix "FTBFS on kfreebsd-*: sys/kern/types.h:87:17: error: expected
unqualified-id before 'char'" patch from Robert Millan
(Closes: #673530)

Added:
    libcommoncpp2/trunk/debian/patches/caddr.diff
Modified:
    libcommoncpp2/trunk/debian/changelog
    libcommoncpp2/trunk/debian/patches/series

Modified: libcommoncpp2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/changelog?rev=9707&op=diff
==============================================================================
--- libcommoncpp2/trunk/debian/changelog (original)
+++ libcommoncpp2/trunk/debian/changelog Sun May 20 02:18:37 2012
@@ -1,3 +1,11 @@
+libcommoncpp2 (1.8.1-4) unstable; urgency=low
+
+  * Fix "FTBFS on kfreebsd-*: sys/kern/types.h:87:17: error: expected
+    unqualified-id before 'char'" patch from Robert Millan
+    (Closes: #673530)
+
+ -- Mark Purcell <msp at debian.org>  Sat, 19 May 2012 11:03:29 +1000
+
 libcommoncpp2 (1.8.1-3) unstable; urgency=low
 
   * source/format -> 3.0 quilt

Added: libcommoncpp2/trunk/debian/patches/caddr.diff
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/patches/caddr.diff?rev=9707&op=file
==============================================================================
--- libcommoncpp2/trunk/debian/patches/caddr.diff (added)
+++ libcommoncpp2/trunk/debian/patches/caddr.diff Sun May 20 02:18:37 2012
@@ -1,0 +1,14 @@
+--- a/inc/cc++/file.h
++++ b/inc/cc++/file.h
+@@ -93,10 +93,7 @@
+ 
+ typedef unsigned long pos_t;
+ #ifndef WIN32
+-// use a define so that if the sys/types.h header already defines caddr_t
+-// as it may on BSD systems, we do not break it by redefining again.
+-#undef  caddr_t
+-#define caddr_t char *
++#include <sys/types.h>
+ typedef size_t ccxx_size_t;
+ #else
+ #if !defined(__BORLANDC__) || __BORLANDC__ >= 0x0560

Modified: libcommoncpp2/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/libcommoncpp2/trunk/debian/patches/series?rev=9707&op=diff
==============================================================================
--- libcommoncpp2/trunk/debian/patches/series (original)
+++ libcommoncpp2/trunk/debian/patches/series Sun May 20 02:18:37 2012
@@ -1,3 +1,4 @@
 applog-inc-fcntl.patch
 cleaning_doc.dpatch
 fix_ciddr_ftbfs.dpatch
+caddr.diff