From: Glenn Morris <rgm@gnu.org>
Date: Tue, 11 May 2010 03:07:52 +0000 (-0700)
Subject: * admin/CPP-DEFINES: More updates.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~211^2~20
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1495e2fc0f493bf20d7b44740b8b99ea8e3e9223;p=emacs.git

* admin/CPP-DEFINES: More updates.
---

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index af1d15e5cff..d4776c9b755 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -55,7 +55,6 @@ HAVE_PTYS
 HAVE_TERMIO
 HAVE_TERMIOS
 INTERRUPT_INPUT
-MAIL_USE_FLOCK
 NARROWPROTO
 SEPCHAR
 SIGTYPE
@@ -220,6 +219,7 @@ LINUX_VERSION_CODE
 LISP_FLOAT_TYPE
 LNOFLSH
 LOCALTIME_CACHE
+MAIL_USE_FLOCK
 MAIL_USE_LOCKF
 MAIL_USE_POP
 MAIL_USE_SYSTEM_LOCK
@@ -310,7 +310,6 @@ _WINSOCKAPI_
 _WINSOCK_H
 __ELF__
 __FreeBSD__
-__FreeBSD_version
 __GNUC__
 __GNU_LIBRARY__
 __GNUC_MINOR__