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]

Re: eglibc-2_14 patch: Add protection on the __caddr_t typedef in usr/include/sys/types.h to avoid problems when caddr_t is defined.

On 12/21/2011 05:27 PM, Mike Frysinger wrote:
On Wednesday 21 December 2011 14:54:38 Diekema, Jon (GE Aviation, US) wrote: 
When using ct-ng 1.13.0, the following patch for eglibc-2_14 was needed
for a i686-pc-mingw32-i686-pc-linux-gnu build.


your patch is horribly mangled.  please send with `git send-email`.
-mike

Sorry, let's try this again.

diff --git a/patches/eglibc/2_14/100-caddr_t-typedef-from-types.h.patch b/patches/eglibc/2_14/100-caddr_t-typedef-from-types.h.patch
new file mode 100644
index 0000000..23d968e
--- /dev/null
+++ b/patches/eglibc/2_14/100-caddr_t-typedef-from-types.h.patch
@@ -0,0 +1,28 @@
+Add protection on the __caddr_t typedef in usr/include/sys/types.h to
+avoid problems when caddr_t is defined.
+
+--- ./posix/sys/types.h 2010-01-26 06:27:38.000000000 -0500
++++ ./posix/sys/types.h 2011-11-17 11:39:03.662925595 -0500
+@@ -113,10 +113,21 @@
+
+ #ifdef __USE_BSD
+ # ifndef __daddr_t_defined
++# ifndef daddr_t
+ typedef __daddr_t daddr_t;
+-typedef __caddr_t caddr_t;
++# else
++# define __daddr_t daddr_t
++# endif
+ # define __daddr_t_defined
+ # endif
++# ifndef __caddr_t_defined
++# ifndef caddr_t
++typedef __caddr_t caddr_t;
++# else
++# define __caddr_t caddr_t
++# endif
++# define __caddr_t_defined
++# endif
+ #endif
+
+ #if (defined __USE_SVID || defined __USE_XOPEN) && !defined __key_t_defined


diff --git a/patches/eglibc/2_14/100-caddr_t-typedef-from-types.h.patch b/patches/eglibc/2_14/100-caddr_t-typedef-from-types.h.patch
new file mode 100644
index 0000000..23d968e
--- /dev/null
+++ b/patches/eglibc/2_14/100-caddr_t-typedef-from-types.h.patch
@@ -0,0 +1,28 @@
+Add protection on the __caddr_t typedef in usr/include/sys/types.h to
+avoid problems when caddr_t is defined.
+
+--- ./posix/sys/types.h	2010-01-26 06:27:38.000000000 -0500
++++ ./posix/sys/types.h	2011-11-17 11:39:03.662925595 -0500
+@@ -113,10 +113,21 @@
+ 
+ #ifdef	__USE_BSD
+ # ifndef __daddr_t_defined
++#  ifndef daddr_t
+ typedef __daddr_t daddr_t;
+-typedef __caddr_t caddr_t;
++#  else
++#    define __daddr_t daddr_t
++#  endif
+ #  define __daddr_t_defined
+ # endif
++# ifndef __caddr_t_defined
++#  ifndef caddr_t
++typedef __caddr_t caddr_t;
++#  else
++#    define __caddr_t caddr_t
++#  endif
++#  define __caddr_t_defined
++# endif
+ #endif
+ 
+ #if (defined __USE_SVID || defined __USE_XOPEN) && !defined __key_t_defined


--
For unsubscribe information see http://sourceware.org/lists.html#faq
Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]