diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-02-14 10:55:52 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-02-14 11:03:00 +0100 |
| commit | 6097e19a055b55bf8c6824f5fefe472393420c46 (patch) | |
| tree | c8a980ee46d1aa86296511c3c48a67db12d80fdf | |
| parent | 8bc31b66273f737f8dc3385aa1fc059631b2a250 (diff) | |
| download | ptxdist-6097e19a055b55bf8c6824f5fefe472393420c46.tar.gz ptxdist-6097e19a055b55bf8c6824f5fefe472393420c46.tar.xz | |
thttpd: add patch to fix building with gcc 4.5
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/thttpd-2.25b/0001-rename-getline-local_getline.patch | 38 | ||||
| -rw-r--r-- | patches/thttpd-2.25b/series | 3 |
2 files changed, 41 insertions, 0 deletions
diff --git a/patches/thttpd-2.25b/0001-rename-getline-local_getline.patch b/patches/thttpd-2.25b/0001-rename-getline-local_getline.patch new file mode 100644 index 000000000..46eff186e --- /dev/null +++ b/patches/thttpd-2.25b/0001-rename-getline-local_getline.patch @@ -0,0 +1,38 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Sun, 13 Feb 2011 22:47:34 +0100 +Subject: [PATCH] rename getline -> local_getline + +fixes a compile error with new toolchain: + +htpasswd.c:52:12: error: conflicting types for 'getline' + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + extras/htpasswd.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/extras/htpasswd.c b/extras/htpasswd.c +index e01ea1d..9bcae4b 100644 +--- a/extras/htpasswd.c ++++ b/extras/htpasswd.c +@@ -49,7 +49,7 @@ static void getword(char *word, char *line, char stop) { + while((line[y++] = line[x++])); + } + +-static int getline(char *s, int n, FILE *f) { ++static int local_getline(char *s, int n, FILE *f) { + register int i=0; + + while(1) { +@@ -189,7 +189,7 @@ int main(int argc, char *argv[]) { + strcpy(user,argv[2]); + + found = 0; +- while(!(getline(line,MAX_STRING_LEN,f))) { ++ while(!(local_getline(line,MAX_STRING_LEN,f))) { + if(found || (line[0] == '#') || (!line[0])) { + putline(tfp,line); + continue; +-- +1.7.2.3 + diff --git a/patches/thttpd-2.25b/series b/patches/thttpd-2.25b/series new file mode 100644 index 000000000..b24d4dd40 --- /dev/null +++ b/patches/thttpd-2.25b/series @@ -0,0 +1,3 @@ +# generated by git-ptx-patches +0001-rename-getline-local_getline.patch +# 50452dc3179ed951c75a375716e84c73 - git-ptx-patches magic |