From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Sun, 27 Jun 2010 21:28:51 +0000 (-0700)
Subject: * src/s/freebsd.h (BSD4_2): Remove redundant definition.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~51^2~106
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bbc803b0bc876ed1f548cdbfc20fd819a430f0ac;p=emacs.git

* src/s/freebsd.h (BSD4_2): Remove redundant definition.
bsd-common.h defines it already.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index a7de72e3f95..12e45710e62 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-27  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* s/freebsd.h (BSD4_2): Remove redundant definition.
+	bsd-common.h defines it already.
+
 2010-06-27  Chong Yidong  <cyd@stupidchicken.com>
 
 	* xfns.c (Fx_create_frame): Don't consult X resouces when setting
diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index 2b53ec0413f..f8d88342621 100644
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -25,9 +25,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Get most of the stuff from bsd-common */
 #include "bsd-common.h"
 
-/* For mem-limits.h. */
-#define BSD4_2
-
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
 
 #define HAVE_GETLOADAVG 1