--- src/support/htdigest.c	2003-04-30 13:43:49.000000000 +0200
+++ src/support/htdigest.c	2014-12-11 10:12:36.836329600 +0100
@@ -112,7 +112,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;
 
@@ -199,7 +199,7 @@
 {
     static char line[MAX_STRING_LEN];
 
-    while (!(getline(line, MAX_STRING_LEN, source))) {  
+    while (!(get_line(line, MAX_STRING_LEN, source))) {  
 	putline(target, line);
     }
 }
@@ -257,7 +257,7 @@
     ap_cpystrn(realm, argv[2], sizeof(realm));
 
     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;
--- src/support/htpasswd.c	2003-02-03 18:13:37.000000000 +0100
+++ src/support/htpasswd.c	2014-12-11 10:12:36.876387200 +0100
@@ -141,7 +141,7 @@
  * Get a line of input from the user, not including any terminating
  * newline.
  */
-static int getline(char *s, int n, FILE *f)
+static int get_line(char *s, int n, FILE *f)
 {
     register int i = 0;
 
@@ -590,7 +590,7 @@
 	char scratch[MAX_STRING_LEN];
 
 	fpw = fopen(pwfilename, "r");
-	while (! (getline(line, sizeof(line), fpw))) {
+	while (! (get_line(line, sizeof(line), fpw))) {
 	    char *colon;
 
 	    if ((line[0] == '#') || (line[0] == '\0')) {
--- src/support/logresolve.c	2001-05-23 00:52:21.000000000 +0200
+++ src/support/logresolve.c	2014-12-11 10:12:38.719036800 +0100
@@ -55,7 +55,7 @@
 #endif /* !MPE && !WIN32*/
 
 static void cgethost(struct in_addr ipnum, char *string, int check);
-static int getline(char *s, int n);
+static int get_line(char *s, int n);
 static void stats(FILE *output);
 
 
@@ -262,7 +262,7 @@
  * gets a line from stdin
  */
 
-static int getline (char *s, int n)
+static int get_line (char *s, int n)
 {
     char *cp;
 
@@ -310,7 +310,7 @@
     for (i = 0; i < MAX_ERR + 2; i++)
 	errors[i] = 0;
 
-    while (getline(line, MAXLINE)) {
+    while (get_line(line, MAXLINE)) {
 	if (line[0] == '\0')
 	    continue;
 	entries++;