| author | Titus von Boxberg <titus@v9g.de> |
| Mon Aug 22 09:40:31 2011 +0200 (2011-08-22) | |
| branch | 1.12 |
| changeset 2637 | 97cc0c987a1a |
| permissions | -rw-r--r-- |
| eha@2379 | 1 |
diff -urN glibc-2.11-orig/posix/sys/types.h glibc-2.11/posix/sys/types.h |
| eha@2379 | 2 |
--- glibc-2.11-orig/posix/sys/types.h 2010-12-13 11:47:26.000000000 +0100 |
| eha@2379 | 3 |
+++ glibc-2.11/posix/sys/types.h 2011-03-29 14:16:00.374064708 +0200 |
| eha@2379 | 4 |
@@ -114,7 +114,10 @@ |
| eha@2379 | 5 |
#ifdef __USE_BSD |
| eha@2379 | 6 |
# ifndef __daddr_t_defined |
| eha@2379 | 7 |
typedef __daddr_t daddr_t; |
| eha@2379 | 8 |
+# if ! defined(caddr_t) && ! defined(__caddr_t_defined) |
| eha@2379 | 9 |
typedef __caddr_t caddr_t; |
| eha@2379 | 10 |
+# define __caddr_t_defined |
| eha@2379 | 11 |
+# endif |
| eha@2379 | 12 |
# define __daddr_t_defined |
| eha@2379 | 13 |
# endif |
| eha@2379 | 14 |
#endif |
| eha@2379 | 15 |
diff -urN glibc-2.11-orig/sunrpc/rpc/types.h glibc-2.11/sunrpc/rpc/types.h |
| eha@2379 | 16 |
--- glibc-2.11-orig/sunrpc/rpc/types.h 2010-12-13 11:47:26.000000000 +0100 |
| eha@2379 | 17 |
+++ glibc-2.11/sunrpc/rpc/types.h 2011-03-29 14:16:32.988910439 +0200 |
| eha@2379 | 18 |
@@ -80,7 +80,10 @@ |
| eha@2379 | 19 |
#endif |
| eha@2379 | 20 |
#ifndef __daddr_t_defined |
| eha@2379 | 21 |
typedef __daddr_t daddr_t; |
| eha@2379 | 22 |
+# if ! defined(caddr_t) && ! defined(__caddr_t_defined) |
| eha@2379 | 23 |
typedef __caddr_t caddr_t; |
| eha@2379 | 24 |
+# define __caddr_t_defined |
| eha@2379 | 25 |
+# endif |
| eha@2379 | 26 |
# define __daddr_t_defined |
| eha@2379 | 27 |
#endif |
| eha@2379 | 28 |