Customize for BSDI and FreeBSD.

diff --git a/v7/src/microcode/oscond.h b/v7/src/microcode/oscond.h
index 94d0d958d4cbf8bf0127a9844775dee722be5b80..f804f3b876279c4ab1ac22895ab692d901f80653 100644 (file)
--- a/v7/src/microcode/oscond.h
+++ b/v7/src/microcode/oscond.h
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: oscond.h,v 1.22 1996/07/01 23:25:27 cph Exp $
+$Id: oscond.h,v 1.23 1997/05/01 01:21:20 cph Exp $
 
-Copyright (c) 1990-96 Massachusetts Institute of Technology
+Copyright (c) 1990-97 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -41,11 +41,19 @@ MIT in each case. */
 /* _POSIX is assumed to be independent of all operating-system and
    machine specification macros.  */
 
-#if defined(__osf__) || defined(_AIX) || defined(__linux)
+#if defined(__osf__) || defined(_AIX) || defined(__linux) || defined(__bsdi__) || defined(_ULTRIX) || defined(__FreeBSD__)
 #  define _POSIX
 #  define _BSD4_3
 #endif
 
+/* From Garrett Wollman <wollman@lcs.mit.edu>:
+   __FreeBSD__ == 1 means version 1.x
+   __FreeBSD__ == 2 means there is an <osreldate.h> and __FreeBSD_version
+   from that header is a release date.
+   __FreeBSD__ == 3 means there is an <osreldate.h> and __FreeBSD_version
+   is a large integer which is not a date (sigh) but which is related to
+   the version number (i.e, it's totally pointless).  */
+
 #if defined(__hpux) && !defined(hpux)
 #define hpux
 #endif
@@ -143,11 +151,6 @@ MIT in each case. */
 
 #endif /* _NEXTOS */
 
-#if defined(_ULTRIX)
-#define _POSIX
-#define _BSD4_3
-#endif
-
 #if defined(_SUNOS3) || defined(_SUNOS4)
 #define _SUNOS
 #define _BSD4_2

diff --git a/v7/src/microcode/s/386bsd.h b/v7/src/microcode/s/386bsd.h
index a6e0423317e54b6facf04d97d31fa0761ec69fda..097a6c11c5558cb0f4057058b30884659bea733d 100644 (file)
--- a/v7/src/microcode/s/386bsd.h
+++ b/v7/src/microcode/s/386bsd.h
@@ -1,9 +1,9 @@
 /* -*-C-*-
    System file for 386BSD
 
-$Id: 386bsd.h,v 1.1 1993/02/18 04:46:18 gjr Exp $
+$Id: 386bsd.h,v 1.2 1997/05/01 01:19:13 cph Exp $
 
-Copyright (c) 1993 Massachusetts Institute of Technology
+Copyright (c) 1993-97 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -33,14 +33,27 @@ Technology nor of any adaptation thereof in any advertising,
 promotional, or sales literature without prior written consent from
 MIT in each case. */
 
-#define C_SWITCH_SYSTEM -D_POSIX -D_BSD -I/usr/X386/include
+#define C_SWITCH_SYSTEM -I/usr/X11R6/include
 
 #define C_OPTIMIZE_SWITCH -O6
 
-#define LIBX11_MACHINE -L/usr/X386/lib
+#define LIBX11_MACHINE -L/usr/X11R6/lib
 
 #define LIBS_TERMCAP -ltermcap
 
 #define LIB_DEBUG
 
 #define ALTERNATE_M4 s/ultrix.m4
+
+/* Use the built-in files <limits.h> and <float.h> rather than those
+   generated by the "hard-par" program.  */
+#define USE_BUILT_IN_LIMITS_FILES
+
+#ifdef __bsdi__
+/* Compile using shared libraries and GCC v2.  */
+#define ALTERNATE_CC shlicc2
+#endif
+
+#ifdef __FreeBSD__
+#define ALTERNATE_CC gcc
+#endif

diff --git a/v7/src/microcode/ux.h b/v7/src/microcode/ux.h
index 9ea5a1d2b9ddc40c9e3c93cf3d167c33ab84c320..5595d1415702f7dfc4a544589f44d95d07c77c77 100644 (file)
--- a/v7/src/microcode/ux.h
+++ b/v7/src/microcode/ux.h
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: ux.h,v 1.65 1996/07/01 23:27:18 cph Exp $
+$Id: ux.h,v 1.66 1997/05/01 01:23:43 cph Exp $
 
 Copyright (c) 1988-96 Massachusetts Institute of Technology
 
@@ -92,6 +92,24 @@ extern int EXFUN (kill, (pid_t, int));
 #  define SYSTEM_VARIANT "386BSD"
 #endif
 
+#ifdef __FreeBSD__
+#  include <sys/ioctl.h>
+#  define EMULATE_FPATHCONF
+#  define EMULATE_SYSCONF
+#  define NO_BAUD_CONVERSION
+#  define SYSTEM_VARIANT "FreeBSD"
+#endif
+
+#ifdef __bsdi__                        /* works on bsdi 3.0 */
+#  define LSEEK_DECLARED
+#  define SELECT_DECLARED
+#  include <sys/ioctl.h>
+#  define EMULATE_FPATHCONF
+#  define EMULATE_SYSCONF
+#  define NO_BAUD_CONVERSION
+#  define SYSTEM_VARIANT "BSDI BSD/OS"
+#endif
+
 /* no longer needed */
 #if 0
 #ifdef sonyrisc