diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2011-11-25 11:48:30 -0300 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-11-26 13:07:14 +0100 |
| commit | 7948b0c621adab123f7585a32c0cf6810f83ca91 (patch) | |
| tree | 335c44e347e93da674a168e9e65c2c554d414d54 /package | |
| parent | 9f930d2d7f6ca80d9ccc9a38e631704c1b931f43 (diff) | |
thttpd: fix build breakage with eglibc/glibc
Fix getline() function conflict with glibc/eglibc by renaming it.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package')
| -rw-r--r-- | package/thttpd/thttpd-2.25b-getline.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/package/thttpd/thttpd-2.25b-getline.patch b/package/thttpd/thttpd-2.25b-getline.patch new file mode 100644 index 000000000..35c366aef --- /dev/null +++ b/package/thttpd/thttpd-2.25b-getline.patch @@ -0,0 +1,26 @@ +Fix glibc/eglibc getline() conflicting functions. + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> +--- + +diff -Nura thttpd-2.25b.orig/extras/htpasswd.c thttpd-2.25b/extras/htpasswd.c +--- thttpd-2.25b.orig/extras/htpasswd.c 2001-12-18 21:08:08.000000000 -0300 ++++ thttpd-2.25b/extras/htpasswd.c 2011-11-25 11:42:47.198582812 -0300 +@@ -49,7 +49,7 @@ + while((line[y++] = line[x++])); + } + +-static int getline(char *s, int n, FILE *f) { ++static int get_line(char *s, int n, FILE *f) { + register int i=0; + + while(1) { +@@ -189,7 +189,7 @@ + strcpy(user,argv[2]); + + found = 0; +- while(!(getline(line,MAX_STRING_LEN,f))) { ++ while(!(get_line(line,MAX_STRING_LEN,f))) { + if(found || (line[0] == '#') || (!line[0])) { + putline(tfp,line); + continue; |