Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 193216 Details for
Bug 271987
net-misc/openswan-2.4.14 fails to compile with glibc 2.10.1
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch that resolves the name clash
openswan-2.4.14-getline.patch (text/plain), 1.53 KB, created by
Timur Aydin
on 2009-06-02 02:40:34 UTC
(
hide
)
Description:
patch that resolves the name clash
Filename:
MIME Type:
Creator:
Timur Aydin
Created:
2009-06-02 02:40:34 UTC
Size:
1.53 KB
patch
obsolete
>diff -Nru openswan-2.4.14.orig/lib/libopenswan/optionsfrom.c openswan-2.4.14/lib/libopenswan/optionsfrom.c >--- openswan-2.4.14.orig/lib/libopenswan/optionsfrom.c 2004-04-09 21:00:38.000000000 +0300 >+++ openswan-2.4.14/lib/libopenswan/optionsfrom.c 2009-06-01 22:21:56.000000000 +0300 >@@ -31,7 +31,7 @@ > > static const char *dowork(const char *, int *, char ***, int); > static const char *getanarg(FILE *, struct work *, char **); >-static char *getline(FILE *, char *, size_t); >+static char *osw_getline(FILE *, char *, size_t); > > /* > - optionsfrom - add some options, taken from a file, to argc/argv >@@ -149,7 +149,7 @@ > char *endp; > > while (w->pending == NULL) { /* no pending line */ >- if ((w->line = getline(f, w->buf, sizeof(w->buf))) == NULL) >+ if ((w->line = osw_getline(f, w->buf, sizeof(w->buf))) == NULL) > return "error in line read"; /* caller checks EOF */ > if (w->line[0] != '#' && > *(w->line + strspn(w->line, " \t")) != '\0') >@@ -171,7 +171,7 @@ > if (*linep == NULL) > return "out of memory for new line"; > strcpy(*linep, p); >- } else /* getline already malloced it */ >+ } else /* osw_getline already malloced it */ > *linep = p; > return NULL; > } >@@ -203,10 +203,10 @@ > } > > /* >- - getline - read a line from the file, trim newline off >+ - osw_getline - read a line from the file, trim newline off > */ > static char * /* pointer to line, NULL for eof/error */ >-getline(f, buf, bufsize) >+osw_getline(f, buf, bufsize) > FILE *f; > char *buf; /* buffer to use, if convenient */ > size_t bufsize; /* size of buf */
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 271987
: 193216