* src/s/freebsd.h (BSD4_2): Remove redundant definition.

bsd-common.h defines it already.

diff --git a/src/ChangeLog b/src/ChangeLog
index a7de72e3f9580d545535e6d009f1daade2d78548..12e45710e62bd31781dc8169405b9322367167e7 100644 (file)
--- 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 2b53ec0413f4ea26ce7e1973cfdd51c7b021dd26..f8d883426218a11a9aa63217b8a3fc447626fb01 100644 (file)
--- 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