From: Jon Diekema <jon.diekema@gmail.com>
To: crossgcc@sourceware.org
Subject: 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.
Date: Fri, 23 Dec 2011 23:42:00 -0000 [thread overview]
Message-ID: <4EF511E4.5010201@gmail.com> (raw)
In-Reply-To: <201112211727.06660.vapier@gentoo.org>
[-- Attachment #1: Type: text/plain, Size: 1378 bytes --]
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
[-- Attachment #2: 100-caddr_t-typedef-from-types.h.patch --]
[-- Type: text/x-patch, Size: 1016 bytes --]
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
[-- Attachment #3: Type: text/plain, Size: 71 bytes --]
--
For unsubscribe information see http://sourceware.org/lists.html#faq
next prev parent reply other threads:[~2011-12-23 23:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-21 19:55 Diekema, Jon (GE Aviation, US)
2011-12-21 22:27 ` Mike Frysinger
2011-12-23 23:42 ` Jon Diekema [this message]
2011-12-31 7:02 ` Mike Frysinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4EF511E4.5010201@gmail.com \
--to=jon.diekema@gmail.com \
--cc=crossgcc@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).