diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-02-09 05:35:18 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-02-09 05:35:18 +0000 |
| commit | b00d7515b220ef835a08002001aafb3528df882c (patch) | |
| tree | 01218c112efd306788c457db74801503ce8cf962 /sys-devel/flex/files | |
| parent | old (diff) | |
| download | historical-b00d7515b220ef835a08002001aafb3528df882c.tar.gz historical-b00d7515b220ef835a08002001aafb3528df882c.tar.bz2 historical-b00d7515b220ef835a08002001aafb3528df882c.zip | |
Update isatty patch to better match the unistd.h prototype #122042.
Package-Manager: portage-2.1_pre4-r1
Diffstat (limited to 'sys-devel/flex/files')
| -rw-r--r-- | sys-devel/flex/files/digest-flex-2.5.31-r2 | 2 | ||||
| -rw-r--r-- | sys-devel/flex/files/flex-2.5.31-isatty.patch | 14 |
2 files changed, 12 insertions, 4 deletions
diff --git a/sys-devel/flex/files/digest-flex-2.5.31-r2 b/sys-devel/flex/files/digest-flex-2.5.31-r2 new file mode 100644 index 000000000000..61100ba95b7b --- /dev/null +++ b/sys-devel/flex/files/digest-flex-2.5.31-r2 @@ -0,0 +1,2 @@ +MD5 363dcc4afc917dc51306eb9d3de0152f flex-2.5.31.tar.bz2 681792 +MD5 7ed573f6e5f9cf7ddea521bc06bedb8a flex_2.5.31-36.diff.gz 211072 diff --git a/sys-devel/flex/files/flex-2.5.31-isatty.patch b/sys-devel/flex/files/flex-2.5.31-isatty.patch index 402d47b9a31e..812293641c80 100644 --- a/sys-devel/flex/files/flex-2.5.31-isatty.patch +++ b/sys-devel/flex/files/flex-2.5.31-isatty.patch @@ -4,37 +4,43 @@ http://bugs.gentoo.org/119598 --- flex/scan.c +++ flex/scan.c -@@ -3935,9 +3935,13 @@ +@@ -3935,9 +3935,15 @@ yyfree((void *) b ); } ++#ifndef _UNISTD_H /* assume unistd.h has isatty() for us */ -#ifndef __cplusplus +#ifdef __cplusplus +extern "C" { +#endif - extern int isatty (int ); +-extern int isatty (int ); ++extern int isatty (int ) __THROW; -#endif /* __cplusplus */ +#ifdef __cplusplus +} +#endif ++#endif /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, --- flex/skel.c +++ flex/skel.c -@@ -2183,9 +2183,13 @@ +@@ -2183,9 +2183,15 @@ "[[", " m4_ifdef( [[M4_YY_NEVER_INTERACTIVE]],,", " [[", ++ "#ifndef _UNISTD_H /* assume unistd.h has isatty() for us */", - "#ifndef __cplusplus", + "#ifdef __cplusplus", + "extern \"C\" {", + "#endif", - "extern int isatty M4_YY_PARAMS( int );", +- "extern int isatty M4_YY_PARAMS( int );", ++ "extern int isatty M4_YY_PARAMS( int ) __THROW;", - "#endif /* __cplusplus */", + "#ifdef __cplusplus", + "}", + "#endif", ++ "#endif", " ]])", "]])", "%endif", |