Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 207821 Details for
Bug 289968
Emerge of app-arch/gzip-1.3.13 dies with redefinition of 'struct rpl_option' error
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Darwin compile fix
fix_darwin.patch (text/plain), 1.02 KB, created by
Johan Bergström
on 2009-10-21 13:59:25 UTC
(
hide
)
Description:
Darwin compile fix
Filename:
MIME Type:
Creator:
Johan Bergström
Created:
2009-10-21 13:59:25 UTC
Size:
1.02 KB
patch
obsolete
>diff -ur gzip-1.3.13/lib/getopt.in.h gzip-1.3.13-new/lib/getopt.in.h >--- gzip-1.3.13/lib/getopt.in.h 2009-09-30 13:05:19 +0200 >+++ gzip-1.3.13-new/lib/getopt.in.h 2009-10-21 15:53:09 +0200 >@@ -22,9 +22,13 @@ > @PRAGMA_SYSTEM_HEADER@ > #endif > >-/* The include_next requires a split double-inclusion guard. */ >+/* The include_next requires a split double-inclusion guard. We must >+ also inform the replacement unistd.h to not recursively use >+ <getopt.h>; our definitions will be present soon enough. */ > #if @HAVE_GETOPT_H@ >+# define _GL_SYSTEM_GETOPT > # @INCLUDE_NEXT@ @NEXT_GETOPT_H@ >+# undef _GL_SYSTEM_GETOPT > #endif > > #ifndef _GL_GETOPT_H >diff -ur gzip-1.3.13/lib/unistd.in.h gzip-1.3.13-new/lib/unistd.in.h >--- gzip-1.3.13/lib/unistd.in.h 2009-09-30 12:54:20 +0200 >+++ gzip-1.3.13-new/lib/unistd.in.h 2009-10-21 15:53:28 +0200 >@@ -51,7 +51,7 @@ > #endif > > /* Get getopt(), optarg, optind, opterr, optopt. */ >-#if @GNULIB_UNISTD_H_GETOPT@ >+#if @GNULIB_UNISTD_H_GETOPT@ && !defined _GL_SYSTEM_GETOPT > # include <getopt.h> > #endif >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 289968
:
207786
| 207821