patches/glibc/2.13/910-typedef-caddr.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Thu Jan 31 21:07:48 2013 +0100 (2013-01-31)
branch1.18
changeset 3179 45a89104a20c
permissions -rw-r--r--
1.18: update version to 1.18.0+hg

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
yann@2438
     1
diff -urN glibc-2.12.1-orig/posix/sys/types.h glibc-2.12.1/posix/sys/types.h
yann@2438
     2
--- glibc-2.12.1-orig/posix/sys/types.h	2010-12-13 11:47:26.000000000 +0100
yann@2438
     3
+++ glibc-2.12.1/posix/sys/types.h	2011-03-29 14:16:00.374064708 +0200
yann@2438
     4
@@ -114,7 +114,10 @@
yann@2438
     5
 #ifdef	__USE_BSD
yann@2438
     6
 # ifndef __daddr_t_defined
yann@2438
     7
 typedef __daddr_t daddr_t;
yann@2438
     8
+#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
yann@2438
     9
 typedef __caddr_t caddr_t;
yann@2438
    10
+#   define __caddr_t_defined
yann@2438
    11
+#  endif
yann@2438
    12
 #  define __daddr_t_defined
yann@2438
    13
 # endif
yann@2438
    14
 #endif
yann@2438
    15
diff -urN glibc-2.12.1-orig/sunrpc/rpc/types.h glibc-2.12.1/sunrpc/rpc/types.h
yann@2438
    16
--- glibc-2.12.1-orig/sunrpc/rpc/types.h	2010-12-13 11:47:26.000000000 +0100
yann@2438
    17
+++ glibc-2.12.1/sunrpc/rpc/types.h	2011-03-29 14:16:32.988910439 +0200
yann@2438
    18
@@ -80,7 +80,10 @@
yann@2438
    19
 #endif
yann@2438
    20
 #ifndef __daddr_t_defined
yann@2438
    21
 typedef __daddr_t daddr_t;
yann@2438
    22
+# if ! defined(caddr_t) && ! defined(__caddr_t_defined)
yann@2438
    23
 typedef __caddr_t caddr_t;
yann@2438
    24
+#  define __caddr_t_defined
yann@2438
    25
+# endif
yann@2438
    26
 # define __daddr_t_defined
yann@2438
    27
 #endif
yann@2438
    28