--- ldapdns.c.orig	2008-01-02 15:44:10.000000000 +0100
+++ ldapdns.c	2008-01-02 15:44:27.000000000 +0100
@@ -21,6 +21,7 @@
 		list_push(&x, lp->str);
 		list_push(&seen, lp->str);
 HIT:
+	;
 	}
 
 	lp = *p;
--- error.h.orig	2008-01-02 15:42:58.000000000 +0100
+++ error.h	2008-01-02 15:43:16.000000000 +0100
@@ -23,7 +23,7 @@
 
 void log_init(char *s);
 
-void inline log(int lev, const char *m, ...);
+void inline elog(int lev, const char *m, ...);
 
 void inline debug(const char *m, ...);
 
--- engine.c.orig	2008-01-02 15:43:33.000000000 +0100
+++ engine.c	2008-01-02 15:43:52.000000000 +0100
@@ -101,7 +101,7 @@
 			engine_message = 1;
 			pthread_mutex_unlock(&engine_message_mutex);
 			pthread_mutex_lock(&log_lock);
-			log(log_info, "pausing");
+			elog(log_info, "pausing");
 			pthread_mutex_unlock(&log_lock);
 		}
 		break;
@@ -112,14 +112,14 @@
 			pthread_cond_broadcast(&engine_pause_cond);
 			pthread_mutex_unlock(&engine_message_mutex);
 			pthread_mutex_lock(&log_lock);
-			log(log_info, "resuming");
+			elog(log_info, "resuming");
 			pthread_mutex_unlock(&log_lock);
 		}
 		break;
 	case SIGTERM:
 	case SIGINT:
 		pthread_mutex_lock(&log_lock);
-		log(log_info, "shutting down");
+		elog(log_info, "shutting down");
 		pthread_mutex_unlock(&log_lock);
 		pthread_mutex_lock(&engine_message_mutex);
 		if (engine_message == 1) {
@@ -3855,10 +3855,10 @@
 	if (ldapdns.one2one_mode) {
 #ifdef ACCELERATE_CACHE
 		if (ldapdns.accelerate_cache)
-			log(log_info, "ldap client caching enabled!");
+			elog(log_info, "ldap client caching enabled!");
 #endif
 
-		log(log_info, "starting ldapdns %s (1:1/%d)", VERSION,
+		elog(log_info, "starting ldapdns %s (1:1/%d)", VERSION,
 				ldapdns.handlers);
 
 		/* alternate message loop */
@@ -3891,9 +3891,9 @@
 	}
 
 	if (ldapdns.accelerate_cache)
-		log(log_info, "ldap client caching enabled!");
+		elog(log_info, "ldap client caching enabled!");
 
-	log(log_info, "starting ldapdns %s (%d:%d/%d)", VERSION,
+	elog(log_info, "starting ldapdns %s (%d:%d/%d)", VERSION,
 				ldapdns.ldap_threads, ldapdns.dns_threads,
 				ldapdns.handlers);
 
--- error.c.orig	2008-01-02 15:50:15.000000000 +0100
+++ error.c	2008-01-02 15:44:44.000000000 +0100
@@ -173,7 +173,7 @@
 	fflush(logfp);
 	va_end(ap);
 }
-void inline log(int lev, const char *m, ...)
+void inline elog(int lev, const char *m, ...)
 {
 	va_list ap;
 	va_start(ap, m);