diff options
| author | markm <markm@FreeBSD.org> | 2002-03-21 23:42:52 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2002-03-21 23:42:52 +0000 |
| commit | b38a0011c18c49fcb516cc2b4f5d751565e53f44 (patch) | |
| tree | 1ec99b3b189dcbff75d7f05f7c29bd03c4d795da /contrib/opie/opie_cfg.h | |
| parent | 084b4588f24346b3d369eaf49193461c380e8521 (diff) | |
| download | FreeBSD-src-b38a0011c18c49fcb516cc2b4f5d751565e53f44.zip FreeBSD-src-b38a0011c18c49fcb516cc2b4f5d751565e53f44.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'contrib/opie/opie_cfg.h')
| -rw-r--r-- | contrib/opie/opie_cfg.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/contrib/opie/opie_cfg.h b/contrib/opie/opie_cfg.h index be29b59..bd000ae 100644 --- a/contrib/opie/opie_cfg.h +++ b/contrib/opie/opie_cfg.h @@ -1,7 +1,7 @@ /* opie_cfg.h: Various configuration-type pieces of information for OPIE. %%% portions-copyright-cmetz-96 -Portions of this software are Copyright 1996-1998 by Craig Metz, All Rights +Portions of this software are Copyright 1996-1999 by Craig Metz, All Rights Reserved. The Inner Net License Version 2 applies to these portions of the software. You should have received a copy of the license with this software. If @@ -14,6 +14,7 @@ License Agreement applies to this software. History: + Modified by cmetz for OPIE 2.4. Removed NBBY definition. Modified by cmetz for OPIE 2.32. Include <sys/types.h> before <dirent.h> to make *BSD happy. Modified by cmetz for OPIE 2.31. Added 4.4BSD-Lite pathnames.h @@ -53,8 +54,8 @@ $FreeBSD$ #ifndef _OPIE_CFG_H #define _OPIE_CFG_H 1 -#define VERSION "2.32" -#define DATE "Thursday, January 1, 1998" +#define VERSION "2.4" +#define DATE "Friday, January 19, 2001" #ifndef unix #define unix 1 @@ -165,10 +166,6 @@ $FreeBSD$ #define MOTD_FILE "/etc/motd" #endif -#ifndef NBBY -#define NBBY 8 /* Reasonable for modern systems */ -#endif /* NBBY */ - #ifndef LOGIN_PATH #define LOGIN_PATH "/usr/ucb:/bin:/usr/bin" #endif /* LOGIN_PATH */ |
