diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 28f3403b369..4f4d2b50a00 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* movemail.c: Add missing 'defined'.
+	Suggested by Sven Joachim in
+	<http://lists.gnu.org/archive/html/emacs-devel/2012-07/msg00218.html>.
+
 2012-07-11  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Port 'movemail' again to Solaris and similar hosts.
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index fb2111fd621..d157aa8c0b9 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -145,7 +145,7 @@ static int mbx_delimit_begin (FILE *mbf);
 static int mbx_delimit_end (FILE *mbf);
 #endif
 
-#if (MAIL_USE_MAILLOCK							\
+#if (defined MAIL_USE_MAILLOCK						\
      || (!defined DISABLE_DIRECT_ACCESS && !defined MAIL_USE_MMDF	\
 	 && !defined MAIL_USE_SYSTEM_LOCK))
 /* Like malloc but get fatal error if memory is exhausted.  */