--- common.h.orig	2011-06-02 20:54:25.000000000 -0500
+++ common.h	2011-06-02 20:54:48.000000000 -0500
@@ -273,7 +273,7 @@
 char *home_filename(char *name);
 void read_ldapvi_history(void);
 void write_ldapvi_history(void);
-char *getline(char *prompt, char *value);
+char *__getline(char *prompt, char *value);
 char *get_password();
 char *append(char *a, char *b);
 void *xalloc(size_t size);
--- ldapvi.c.orig	2011-06-02 20:55:20.000000000 -0500
+++ ldapvi.c	2011-06-02 20:55:29.000000000 -0500
@@ -470,7 +470,7 @@
 		bo->authmethod = LDAP_AUTH_SASL;
 		puts("Switching to SASL authentication.");
 	}
-	bo->sasl_mech = getline("SASL mechanism", bo->sasl_mech);
+	bo->sasl_mech = __getline("SASL mechanism", bo->sasl_mech);
 }
 
 static int
--- misc.c.orig	2011-06-02 20:54:30.000000000 -0500
+++ misc.c	2011-06-02 20:55:13.000000000 -0500
@@ -315,7 +315,7 @@
 }
 
 char *
-getline(char *prompt, char *value)
+__getline(char *prompt, char *value)
 {
 	tdialog d;
 	init_dialog(&d, DIALOG_DEFAULT, prompt, value);