diff -Naupr thttpd-2.25b.orig/extras/htpasswd.c thttpd-2.25b/extras/htpasswd.c
--- thttpd-2.25b.orig/extras/htpasswd.c	2009-04-11 11:43:28.910251860 +0200
+++ thttpd-2.25b/extras/htpasswd.c	2009-04-11 11:44:00.737126470 +0200
@@ -54,7 +54,7 @@ static void getword(char *word, char *li
     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) {
@@ -225,7 +225,7 @@ int main(int argc, char *argv[]) {
 
     found = 0;
     /* line we get is username:pwd, or possibly any other cruft */
-    while(!(getline(line,MAX_LINE_LEN,f))) {
+    while(!(get_line(line,MAX_LINE_LEN,f))) {
         char *i;
 
         if(found || (line[0] == '#') || (!line[0])) {