diff options
author | Dan Nicolaescu <dann@ics.uci.edu> | 2010-03-20 00:57:11 -0700 |
---|---|---|
committer | Dan Nicolaescu <dann@ics.uci.edu> | 2010-03-20 00:57:11 -0700 |
commit | 05a670e6d3593a9e68804447dee5596fb7ca5ed4 (patch) | |
tree | 59e4b3d3822a20827b163fed8e9e9403d36bf6bc /src/s/freebsd.h | |
parent | 2968f56146eac37708de08f30a58d662ce5f037f (diff) | |
download | emacs-05a670e6d3593a9e68804447dee5596fb7ca5ed4.tar.gz |
Consolidate redundant definitions in s/bsd-common.h.
* s/bsd-common.h (BSD4_2, TABDLY, TAB3, HAVE_TERMIOS, NO_TERMIO)
(LIBS_DEBUG, SYSV_SYSTEM_DIR, UNEXEC, NARROWPROTO, BSD_PGRPS)
(LDAV_SYMBOL, KERNEL_FILE): Define (or undefine) here instead of
doing it in all files that include this one.
* s/gnu.h (BSD4_2, TABDLY, TAB3, HAVE_TERMIOS, NO_TERMIO)
(LIBS_DEBUG, SYSV_SYSTEM_DIR, UNEXEC, NARROWPROTO, BSD_PGRPS)
(LDAV_SYMBOL, KERNEL_FILE): Remove.
* s/freebsd.h (BSD4_2, TABDLY, TAB3, HAVE_TERMIOS, NO_TERMIO)
(LIBS_DEBUG, SYSV_SYSTEM_DIR, UNEXEC, NARROWPROTO, BSD_PGRPS)
(LDAV_SYMBOL, KERNEL_FILE): Remove.
* s/netbsd.h (BSD4_2, TABDLY, TAB3, HAVE_TERMIOS, NO_TERMIO)
(LIBS_DEBUG, SYSV_SYSTEM_DIR, UNEXEC, NARROWPROTO, BSD_PGRPS)
(LDAV_SYMBOL, KERNEL_FILE): Remove.
Diffstat (limited to 'src/s/freebsd.h')
-rw-r--r-- | src/s/freebsd.h | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/s/freebsd.h b/src/s/freebsd.h index ad7f77acc8f..a84627d3268 100644 --- a/src/s/freebsd.h +++ b/src/s/freebsd.h @@ -29,13 +29,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* For mem-limits.h. */ #define BSD4_2 -/* These aren't needed, since we have getloadavg. */ -#undef KERNEL_FILE -#undef LDAV_SYMBOL - #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) -#define LIBS_DEBUG #define LIBS_SYSTEM -lutil #if __FreeBSD_version < 400000 #define LIBS_TERMCAP -ltermcap @@ -44,31 +39,19 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define LIBS_TERMCAP -lncurses #endif -#define SYSV_SYSTEM_DIR - -/* freebsd has POSIX-style pgrp behavior. */ -#undef BSD_PGRPS - /* Let `ld' find image libs and similar things in /usr/local/lib. The system compiler, GCC, has apparently been modified to not look there, contrary to what a stock GCC would do. */ #define LD_SWITCH_SYSTEM -L/usr/local/lib #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o -#define UNEXEC unexelf.o #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o #undef LIB_GCC #define LIB_GCC #define HAVE_GETLOADAVG 1 -#define HAVE_TERMIOS -#define NO_TERMIO #define DECLARE_GETPWUID_WITH_UID_T -/* freebsd uses OXTABS instead of the expected TAB3. */ -#define TABDLY OXTABS -#define TAB3 OXTABS - /* this silences a few compilation warnings */ #undef BSD_SYSTEM #if __FreeBSD__ == 1 @@ -84,14 +67,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ ioctl TIOCSCTTY. */ #define DONT_REOPEN_PTY -/* If the system's imake configuration file defines `NeedWidePrototypes' - as `NO', we must define NARROWPROTO manually. Such a define is - generated in the Makefile generated by `xmkmf'. If we don't - define NARROWPROTO, we will see the wrong function prototypes - for X functions taking float or double parameters. */ - -#define NARROWPROTO 1 - /* The following is needed to make `configure' find Xpm, Xaw3d and image include and library files if using /usr/bin/gcc. That compiler seems to be modified to not find headers in |