This is the mail archive of the crossgcc@sourceware.org mailing list for the crossgcc project.

See the CrossGCC FAQ for lots more information.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

[PATCH] Workaround for autoconf'ed define of caddr_t

From: Esben Haabendal <eha at dev dot doredevelopment dot dk>
To: crossgcc at sourceware dot org
Date: Wed, 30 Mar 2011 16:08:46 +0200
Subject: [PATCH] Workaround for autoconf'ed define of caddr_t

diff -urN crosstool-ng-1.10.0-orig/patches/glibc/2.12.2/910-typedef-caddr.patch crosstool-ng-1.10.0/patches/glibc/2.12.2/910-typedef-caddr.patch
--- crosstool-ng-1.10.0-orig/patches/glibc/2.12.2/910-typedef-caddr.patch	1970-01-01 01:00:00.000000000 +0100
+++ crosstool-ng-1.10.0/patches/glibc/2.12.2/910-typedef-caddr.patch	2011-03-29 14:43:54.702462657 +0200
@@ -0,0 +1,28 @@
+diff -urN glibc-2.12.2-orig/posix/sys/types.h glibc-2.12.2/posix/sys/types.h
+--- glibc-2.12.2-orig/posix/sys/types.h	2010-12-13 11:47:26.000000000 +0100
++++ glibc-2.12.2/posix/sys/types.h	2011-03-29 14:16:00.374064708 +0200
+@@ -114,7 +114,10 @@
+ #ifdef	__USE_BSD
+ # ifndef __daddr_t_defined
+ typedef __daddr_t daddr_t;
++#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
+ typedef __caddr_t caddr_t;
++#   define __caddr_t_defined
++#  endif
+ #  define __daddr_t_defined
+ # endif
+ #endif
+diff -urN glibc-2.12.2-orig/sunrpc/rpc/types.h glibc-2.12.2/sunrpc/rpc/types.h
+--- glibc-2.12.2-orig/sunrpc/rpc/types.h	2010-12-13 11:47:26.000000000 +0100
++++ glibc-2.12.2/sunrpc/rpc/types.h	2011-03-29 14:16:32.988910439 +0200
+@@ -80,7 +80,10 @@
+ #endif
+ #ifndef __daddr_t_defined
+ typedef __daddr_t daddr_t;
++# if ! defined(caddr_t) && ! defined(__caddr_t_defined)
+ typedef __caddr_t caddr_t;
++#  define __caddr_t_defined
++# endif
+ # define __daddr_t_defined
+ #endif
+ 
diff -urN crosstool-ng-1.10.0-orig/patches/glibc/2.12.1/910-typedef-caddr.patch crosstool-ng-1.10.0/patches/glibc/2.12.1/910-typedef-caddr.patch
--- crosstool-ng-1.10.0-orig/patches/glibc/2.12.1/910-typedef-caddr.patch	1970-01-01 01:00:00.000000000 +0100
+++ crosstool-ng-1.10.0/patches/glibc/2.12.1/910-typedef-caddr.patch	2011-03-29 14:43:54.702462657 +0200
@@ -0,0 +1,28 @@
+diff -urN glibc-2.12.1-orig/posix/sys/types.h glibc-2.12.1/posix/sys/types.h
+--- glibc-2.12.1-orig/posix/sys/types.h	2010-12-13 11:47:26.000000000 +0100
++++ glibc-2.12.1/posix/sys/types.h	2011-03-29 14:16:00.374064708 +0200
+@@ -114,7 +114,10 @@
+ #ifdef	__USE_BSD
+ # ifndef __daddr_t_defined
+ typedef __daddr_t daddr_t;
++#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
+ typedef __caddr_t caddr_t;
++#   define __caddr_t_defined
++#  endif
+ #  define __daddr_t_defined
+ # endif
+ #endif
+diff -urN glibc-2.12.1-orig/sunrpc/rpc/types.h glibc-2.12.1/sunrpc/rpc/types.h
+--- glibc-2.12.1-orig/sunrpc/rpc/types.h	2010-12-13 11:47:26.000000000 +0100
++++ glibc-2.12.1/sunrpc/rpc/types.h	2011-03-29 14:16:32.988910439 +0200
+@@ -80,7 +80,10 @@
+ #endif
+ #ifndef __daddr_t_defined
+ typedef __daddr_t daddr_t;
++# if ! defined(caddr_t) && ! defined(__caddr_t_defined)
+ typedef __caddr_t caddr_t;
++#  define __caddr_t_defined
++# endif
+ # define __daddr_t_defined
+ #endif
+ 
diff -urN crosstool-ng-1.10.0-orig/patches/glibc/2.11.1/910-typedef-caddr.patch crosstool-ng-1.10.0/patches/glibc/2.11.1/910-typedef-caddr.patch
--- crosstool-ng-1.10.0-orig/patches/glibc/2.11.1/910-typedef-caddr.patch	1970-01-01 01:00:00.000000000 +0100
+++ crosstool-ng-1.10.0/patches/glibc/2.11.1/910-typedef-caddr.patch	2011-03-29 14:43:54.702462657 +0200
@@ -0,0 +1,28 @@
+diff -urN glibc-2.11.1-orig/posix/sys/types.h glibc-2.11.1/posix/sys/types.h
+--- glibc-2.11.1-orig/posix/sys/types.h	2010-12-13 11:47:26.000000000 +0100
++++ glibc-2.11.1/posix/sys/types.h	2011-03-29 14:16:00.374064708 +0200
+@@ -114,7 +114,10 @@
+ #ifdef	__USE_BSD
+ # ifndef __daddr_t_defined
+ typedef __daddr_t daddr_t;
++#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
+ typedef __caddr_t caddr_t;
++#   define __caddr_t_defined
++#  endif
+ #  define __daddr_t_defined
+ # endif
+ #endif
+diff -urN glibc-2.11.1-orig/sunrpc/rpc/types.h glibc-2.11.1/sunrpc/rpc/types.h
+--- glibc-2.11.1-orig/sunrpc/rpc/types.h	2010-12-13 11:47:26.000000000 +0100
++++ glibc-2.11.1/sunrpc/rpc/types.h	2011-03-29 14:16:32.988910439 +0200
+@@ -80,7 +80,10 @@
+ #endif
+ #ifndef __daddr_t_defined
+ typedef __daddr_t daddr_t;
++# if ! defined(caddr_t) && ! defined(__caddr_t_defined)
+ typedef __caddr_t caddr_t;
++#  define __caddr_t_defined
++# endif
+ # define __daddr_t_defined
+ #endif
+ 
diff -urN crosstool-ng-1.10.0-orig/patches/glibc/2.11/910-typedef-caddr.patch crosstool-ng-1.10.0/patches/glibc/2.11/910-typedef-caddr.patch
--- crosstool-ng-1.10.0-orig/patches/glibc/2.11/910-typedef-caddr.patch	1970-01-01 01:00:00.000000000 +0100
+++ crosstool-ng-1.10.0/patches/glibc/2.11/910-typedef-caddr.patch	2011-03-29 14:43:54.702462657 +0200
@@ -0,0 +1,28 @@
+diff -urN glibc-2.11-orig/posix/sys/types.h glibc-2.11/posix/sys/types.h
+--- glibc-2.11-orig/posix/sys/types.h	2010-12-13 11:47:26.000000000 +0100
++++ glibc-2.11/posix/sys/types.h	2011-03-29 14:16:00.374064708 +0200
+@@ -114,7 +114,10 @@
+ #ifdef	__USE_BSD
+ # ifndef __daddr_t_defined
+ typedef __daddr_t daddr_t;
++#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
+ typedef __caddr_t caddr_t;
++#   define __caddr_t_defined
++#  endif
+ #  define __daddr_t_defined
+ # endif
+ #endif
+diff -urN glibc-2.11-orig/sunrpc/rpc/types.h glibc-2.11/sunrpc/rpc/types.h
+--- glibc-2.11-orig/sunrpc/rpc/types.h	2010-12-13 11:47:26.000000000 +0100
++++ glibc-2.11/sunrpc/rpc/types.h	2011-03-29 14:16:32.988910439 +0200
+@@ -80,7 +80,10 @@
+ #endif
+ #ifndef __daddr_t_defined
+ typedef __daddr_t daddr_t;
++# if ! defined(caddr_t) && ! defined(__caddr_t_defined)
+ typedef __caddr_t caddr_t;
++#  define __caddr_t_defined
++# endif
+ # define __daddr_t_defined
+ #endif
+ 
diff -urN crosstool-ng-1.10.0-orig/patches/glibc/2.10.1/910-typedef-caddr.patch crosstool-ng-1.10.0/patches/glibc/2.10.1/910-typedef-caddr.patch
--- crosstool-ng-1.10.0-orig/patches/glibc/2.10.1/910-typedef-caddr.patch	1970-01-01 01:00:00.000000000 +0100
+++ crosstool-ng-1.10.0/patches/glibc/2.10.1/910-typedef-caddr.patch	2011-03-29 14:43:54.702462657 +0200
@@ -0,0 +1,28 @@
+diff -urN glibc-2.10.1-orig/posix/sys/types.h glibc-2.10.1/posix/sys/types.h
+--- glibc-2.10.1-orig/posix/sys/types.h	2010-12-13 11:47:26.000000000 +0100
++++ glibc-2.10.1/posix/sys/types.h	2011-03-29 14:16:00.374064708 +0200
+@@ -114,7 +114,10 @@
+ #ifdef	__USE_BSD
+ # ifndef __daddr_t_defined
+ typedef __daddr_t daddr_t;
++#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
+ typedef __caddr_t caddr_t;
++#   define __caddr_t_defined
++#  endif
+ #  define __daddr_t_defined
+ # endif
+ #endif
+diff -urN glibc-2.10.1-orig/sunrpc/rpc/types.h glibc-2.10.1/sunrpc/rpc/types.h
+--- glibc-2.10.1-orig/sunrpc/rpc/types.h	2010-12-13 11:47:26.000000000 +0100
++++ glibc-2.10.1/sunrpc/rpc/types.h	2011-03-29 14:16:32.988910439 +0200
+@@ -80,7 +80,10 @@
+ #endif
+ #ifndef __daddr_t_defined
+ typedef __daddr_t daddr_t;
++# if ! defined(caddr_t) && ! defined(__caddr_t_defined)
+ typedef __caddr_t caddr_t;
++#  define __caddr_t_defined
++# endif
+ # define __daddr_t_defined
+ #endif
+ 
diff -urN crosstool-ng-1.10.0-orig/patches/glibc/2.9/910-typedef-caddr.patch crosstool-ng-1.10.0/patches/glibc/2.9/910-typedef-caddr.patch
--- crosstool-ng-1.10.0-orig/patches/glibc/2.9/910-typedef-caddr.patch	1970-01-01 01:00:00.000000000 +0100
+++ crosstool-ng-1.10.0/patches/glibc/2.9/910-typedef-caddr.patch	2011-03-29 14:43:54.702462657 +0200
@@ -0,0 +1,28 @@
+diff -urN glibc-2.9-orig/posix/sys/types.h glibc-2.9/posix/sys/types.h
+--- glibc-2.9-orig/posix/sys/types.h	2010-12-13 11:47:26.000000000 +0100
++++ glibc-2.9/posix/sys/types.h	2011-03-29 14:16:00.374064708 +0200
+@@ -114,7 +114,10 @@
+ #ifdef	__USE_BSD
+ # ifndef __daddr_t_defined
+ typedef __daddr_t daddr_t;
++#  if ! defined(caddr_t) && ! defined(__caddr_t_defined)
+ typedef __caddr_t caddr_t;
++#   define __caddr_t_defined
++#  endif
+ #  define __daddr_t_defined
+ # endif
+ #endif
+diff -urN glibc-2.9-orig/sunrpc/rpc/types.h glibc-2.9/sunrpc/rpc/types.h
+--- glibc-2.9-orig/sunrpc/rpc/types.h	2010-12-13 11:47:26.000000000 +0100
++++ glibc-2.9/sunrpc/rpc/types.h	2011-03-29 14:16:32.988910439 +0200
+@@ -80,7 +80,10 @@
+ #endif
+ #ifndef __daddr_t_defined
+ typedef __daddr_t daddr_t;
++# if ! defined(caddr_t) && ! defined(__caddr_t_defined)
+ typedef __caddr_t caddr_t;
++#  define __caddr_t_defined
++# endif
+ # define __daddr_t_defined
+ #endif
+ 



YMMV.

/Esben

--
For unsubscribe information see http://sourceware.org/lists.html#faq

Follow-Ups:
- Re: [PATCH] Workaround for autoconf'ed define of caddr_t
  - From: Esben Haabendal

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]