diff options
| author | Ted Lemon <source@isc.org> | 1998-06-25 18:34:47 +0000 |
|---|---|---|
| committer | Ted Lemon <source@isc.org> | 1998-06-25 18:34:47 +0000 |
| commit | 85858f227779b25f3b88f0c2272b529c49117ac9 (patch) | |
| tree | 9975978e753188d5084d9a8df30b196dd3c62a31 | |
| parent | f41671a76a592b0b6456c9615a077313f3241bc7 (diff) | |
| download | isc-dhcp-85858f227779b25f3b88f0c2272b529c49117ac9.tar.gz | |
Rhapsody support
| -rw-r--r-- | Makefile.conf | 8 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | includes/osdep.h | 4 | ||||
| -rw-r--r-- | relay/dhcrelay.c | 8 |
4 files changed, 21 insertions, 1 deletions
diff --git a/Makefile.conf b/Makefile.conf index bb2d3c0a..df041808 100644 --- a/Makefile.conf +++ b/Makefile.conf @@ -145,6 +145,14 @@ VARDB = /var/db #SCRIPT=freebsd ##--freebsd-- +## Rhapsody +##--rhapsody-- +#CF = cf/rhapsody.h +#COPTS = -Wall -Wno-unused -Wno-implicit -Wno-comment \ +# -Wno-uninitialized -Werror -pipe +#SCRIPT=rhapsody +##--rhapsody-- + ## NetBSD ##--netbsd-- #CF = cf/netbsd.h @@ -7,6 +7,8 @@ machine=`uname -m` if [ "$sysname" = "" ]; then case $uname in + Rhapsody) + sysname=rhapsody;; ULTRIX) sysname=ultrix;; BSD/OS) diff --git a/includes/osdep.h b/includes/osdep.h index deacaedd..4ea4cd86 100644 --- a/includes/osdep.h +++ b/includes/osdep.h @@ -113,7 +113,11 @@ #endif #ifdef NeXT +# ifdef __APPLE__ +# include "cf/rhapsody.h" +# else # include "cf/nextstep.h" +# endif #endif /* Porting:: diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c index 5c0091b7..1631211a 100644 --- a/relay/dhcrelay.c +++ b/relay/dhcrelay.c @@ -42,7 +42,7 @@ #ifndef lint static char copyright[] = -"$Id: dhcrelay.c,v 1.9.2.2 1998/06/25 05:50:23 mellon Exp $ Copyright (c) 1997 The Internet Software Consortium. All rights reserved.\n"; +"$Id: dhcrelay.c,v 1.9.2.3 1998/06/25 18:34:47 mellon Exp $ Copyright (c) 1997 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -56,6 +56,12 @@ struct tree_cache *global_options [256]; int log_perror = 1; +/* Needed to prevent linking against conflex.c. */ +int lexline; +int lexchar; +char *token_line; +char *tlname; + char *path_dhcrelay_pid = _PATH_DHCRELAY_PID; #ifdef USE_FALLBACK |