[Glibc-bsd-commits] r5319 - in trunk/ctfutils/debian: . patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-01-08 19:57:15 +0000 (Wed, 08 Jan 2014)
New Revision: 5319

Added:
   trunk/ctfutils/debian/patches/off64_t.diff
Modified:
   trunk/ctfutils/debian/changelog
   trunk/ctfutils/debian/patches/series
Log:
off64_t.diff: Fix off64_t typedef conflict.

Modified: trunk/ctfutils/debian/changelog
===================================================================
--- trunk/ctfutils/debian/changelog	2014-01-08 14:17:35 UTC (rev 5318)
+++ trunk/ctfutils/debian/changelog	2014-01-08 19:57:15 UTC (rev 5319)
@@ -1,3 +1,9 @@
+ctfutils (9.2-4) unstable; urgency=low
+
+  * off64_t.diff: Fix off64_t typedef conflict.
+
+ -- Robert Millan <rmh at debian.org>  Wed, 08 Jan 2014 20:57:01 +0100
+
 ctfutils (9.2-3) unstable; urgency=low
 
   * Bump freebsd-glue requirement to 0.2.16 to fix FTBFS on non-

Added: trunk/ctfutils/debian/patches/off64_t.diff
===================================================================
--- trunk/ctfutils/debian/patches/off64_t.diff	                        (rev 0)
+++ trunk/ctfutils/debian/patches/off64_t.diff	2014-01-08 19:57:15 UTC (rev 5319)
@@ -0,0 +1,12 @@
+--- a/sys/cddl/compat/opensolaris/sys/types.h
++++ b/sys/cddl/compat/opensolaris/sys/types.h
+@@ -52,7 +52,8 @@
+ typedef u_long		ulong_t;
+ typedef long long	longlong_t;  
+ typedef unsigned long long u_longlong_t;
+-typedef off_t		off64_t;
++typedef __off64_t	off64_t;
++#define __off64_t_defined
+ typedef id_t		taskid_t;
+ typedef id_t		projid_t;
+ typedef id_t		poolid_t;

Modified: trunk/ctfutils/debian/patches/series
===================================================================
--- trunk/ctfutils/debian/patches/series	2014-01-08 14:17:35 UTC (rev 5318)
+++ trunk/ctfutils/debian/patches/series	2014-01-08 19:57:15 UTC (rev 5319)
@@ -5,6 +5,7 @@
 
 # Other patches that might or might not be mergeable
 ulong_t.diff
+off64_t.diff
 
 # Patches that are likely to be Debian-specific
 makefile.diff