diff options
| author | Dan Nicolaescu | 2010-06-27 14:28:51 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-06-27 14:28:51 -0700 |
| commit | bbc803b0bc876ed1f548cdbfc20fd819a430f0ac (patch) | |
| tree | 4272e2bc0cb078e627dca620c78612cc460af046 /src | |
| parent | 2286174ec6dd3d19ebb6ae58e6611eb5d5967499 (diff) | |
| download | emacs-bbc803b0bc876ed1f548cdbfc20fd819a430f0ac.tar.gz emacs-bbc803b0bc876ed1f548cdbfc20fd819a430f0ac.zip | |
* src/s/freebsd.h (BSD4_2): Remove redundant definition.
bsd-common.h defines it already.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/s/freebsd.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a7de72e3f95..12e45710e62 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-06-27 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * s/freebsd.h (BSD4_2): Remove redundant definition. | ||
| 4 | bsd-common.h defines it already. | ||
| 5 | |||
| 1 | 2010-06-27 Chong Yidong <cyd@stupidchicken.com> | 6 | 2010-06-27 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 7 | ||
| 3 | * xfns.c (Fx_create_frame): Don't consult X resouces when setting | 8 | * 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/>. */ | |||
| 25 | /* Get most of the stuff from bsd-common */ | 25 | /* Get most of the stuff from bsd-common */ |
| 26 | #include "bsd-common.h" | 26 | #include "bsd-common.h" |
| 27 | 27 | ||
| 28 | /* For mem-limits.h. */ | ||
| 29 | #define BSD4_2 | ||
| 30 | |||
| 31 | #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) | 28 | #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) |
| 32 | 29 | ||
| 33 | #define HAVE_GETLOADAVG 1 | 30 | #define HAVE_GETLOADAVG 1 |