[Glibc-bsd-commits] r4860 - in trunk/kfreebsd-kernel-headers/debian: . patches
Robert Millan
rmh at alioth.debian.org
Sun Aug 4 16:08:58 UTC 2013
Author: rmh
Date: 2013-08-04 16:08:58 +0000 (Sun, 04 Aug 2013)
New Revision: 4860
Modified:
trunk/kfreebsd-kernel-headers/debian/changelog
trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff
Log:
Disable a few function declarations in <sys/types.h> which may potentially collide with the ones from Glibc.
Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog 2013-08-04 15:32:14 UTC (rev 4859)
+++ trunk/kfreebsd-kernel-headers/debian/changelog 2013-08-04 16:08:58 UTC (rev 4860)
@@ -1,3 +1,10 @@
+kfreebsd-kernel-headers (9.1-4) UNRELEASED; urgency=low
+
+ * Disable a few function declarations in <sys/types.h> which may
+ potentially collide with the ones from Glibc.
+
+ -- Robert Millan <rmh at debian.org> Sun, 04 Aug 2013 18:07:05 +0200
+
kfreebsd-kernel-headers (9.1-3) unstable; urgency=low
* Restore kldunloadf().
Modified: trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff 2013-08-04 15:32:14 UTC (rev 4859)
+++ trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff 2013-08-04 16:08:58 UTC (rev 4860)
@@ -195,6 +195,15 @@
/*
* minor() gives a cookie instead of an index since we don't want to
* change the meanings of bits 0-15 or waste time and space shifting
+@@ -297,7 +301,7 @@
+ * <stdio.h> to give broken programs a better chance of working with
+ * 64-bit off_t's.
+ */
+-#ifndef _KERNEL
++#if 0
+ __BEGIN_DECLS
+ #ifndef _FTRUNCATE_DECLARED
+ #define _FTRUNCATE_DECLARED
--- a/sys/sys/time.h
+++ b/sys/sys/time.h
@@ -36,11 +36,14 @@
@@ -229,8 +238,8 @@
/*
* Names of the interval timers, and structure
* defining a timer setting.
-@@ -273,6 +277,8 @@
- #define TIMER_ABSTIME 0x1 /* absolute timer */
+@@ -279,6 +283,8 @@
+ #define CPUCLOCK_WHICH_TID 1
#endif
+#endif
@@ -238,7 +247,7 @@
#ifdef _KERNEL
/*
-@@ -338,6 +344,7 @@
+@@ -344,6 +350,7 @@
#include <sys/cdefs.h>
#include <sys/select.h>
@@ -246,7 +255,7 @@
__BEGIN_DECLS
int setitimer(int, const struct itimerval *, struct itimerval *);
int utimes(const char *, const struct timeval *);
-@@ -356,6 +363,7 @@
+@@ -363,6 +370,7 @@
#endif
__END_DECLS
More information about the Glibc-bsd-commits
mailing list