From 7948b0c621adab123f7585a32c0cf6810f83ca91 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 25 Nov 2011 11:48:30 -0300 Subject: thttpd: fix build breakage with eglibc/glibc Fix getline() function conflict with glibc/eglibc by renaming it. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/thttpd/thttpd-2.25b-getline.patch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 package/thttpd/thttpd-2.25b-getline.patch (limited to 'package/thttpd') 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 +--- + +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; -- cgit v1.2.3