diff options
author | Tim Rice <tim@multitalents.net> | 2002-04-11 20:35:39 -0700 |
---|---|---|
committer | Tim Rice <tim@multitalents.net> | 2002-04-11 20:35:39 -0700 |
commit | 813f0452edb4e6ac8bd07b1e8ea5b60ec46874e8 (patch) | |
tree | 3d6e832d042cd8c1033a53181449a9e18ed69911 /defines.h | |
parent | 0c283d8444cace9aad1793b9ebdbceb4726c6d9a (diff) |
[acconfig.h defines.h includes.h] put includes in includes.h and
defines in defines.h [rijndael.c openbsd-compat/fake-socket.h
openbsd-compat/inet_aton.c] include "includes.h" instead of "config.h"
ok stevesk@
Diffstat (limited to 'defines.h')
-rw-r--r-- | defines.h | 94 |
1 files changed, 13 insertions, 81 deletions
@@ -1,62 +1,7 @@ #ifndef _DEFINES_H #define _DEFINES_H -/* $Id: defines.h,v 1.85 2002/04/06 23:52:05 mouring Exp $ */ - -/* Necessary headers */ - -#include <sys/types.h> /* For [u]intxx_t */ -#include <sys/socket.h> /* For SHUT_XXXX */ -#include <sys/param.h> /* For MAXPATHLEN and roundup() */ -#include <netinet/in_systm.h> /* For typedefs */ -#include <netinet/in.h> /* For IPv6 macros */ -#include <netinet/ip.h> /* For IPTOS macros */ -#ifdef HAVE_RPC_TYPES_H -# include <rpc/types.h> /* For INADDR_LOOPBACK */ -#endif -#ifdef HAVE_SYS_UN_H -# include <sys/un.h> /* For sockaddr_un */ -#endif -#ifdef HAVE_SYS_BITYPES_H -# include <sys/bitypes.h> /* For u_intXX_t */ -#endif -#ifdef HAVE_PATHS_H -# include <paths.h> /* For _PATH_XXX */ -#endif -#ifdef HAVE_LIMITS_H -# include <limits.h> /* For PATH_MAX */ -#endif -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> /* For timersub */ -#endif -#ifdef HAVE_MAILLOCK_H -# include <maillock.h> /* For _PATH_MAILDIR */ -#endif -#ifdef HAVE_SYS_CDEFS_H -# include <sys/cdefs.h> /* For __P() */ -#endif -#ifdef HAVE_SYS_SYSMACROS_H -# include <sys/sysmacros.h> /* For MIN, MAX, etc */ -#endif -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> /* For S_* constants and macros */ -#endif -#ifdef HAVE_NEXT -# include <libc.h> -#endif - -#include <unistd.h> /* For STDIN_FILENO, etc */ -#include <termios.h> /* Struct winsize */ -#include <fcntl.h> /* For O_NONBLOCK */ -#include <openssl/opensslv.h> /* For OPENSSL_VERSION_NUMBER */ - -/* *-*-nto-qnx needs these headers for strcasecmp and LASTLOG_FILE respectively */ -#ifdef HAVE_STRINGS_H -# include <strings.h> -#endif -#ifdef HAVE_LOGIN_H -# include <login.h> -#endif +/* $Id: defines.h,v 1.86 2002/04/12 03:35:40 tim Exp $ */ /* Constants */ @@ -139,6 +84,14 @@ enum # define S_IRWXO 0000007 /* read, write, execute */ #endif /* S_IXUSR */ +#if !defined(MAP_ANON) && defined(MAP_ANONYMOUS) +#define MAP_ANON MAP_ANONYMOUS +#endif + +#ifndef MAP_FAILED +# define MAP_FAILED ((void *)-1) +#endif + /* *-*-nto-qnx doesn't define this constant in the system headers */ #ifdef MISSING_NFDBITS # define NFDBITS (8 * sizeof(unsigned long)) @@ -440,10 +393,6 @@ struct winsize { # define howmany(x,y) (((x)+((y)-1))/(y)) #endif -#ifdef __hpux -#define MAP_ANON MAP_ANONYMOUS -#endif - #ifndef ALIGNBYTES #define ALIGNBYTES (sizeof(int) - 1) #endif @@ -466,6 +415,10 @@ struct winsize { /* Function replacement / compatibility hacks */ +#ifndef HAVE_GETOPT_OPTRESET +#define getopt(ac, av, o) BSDgetopt(ac, av, o) +#endif + /* In older versions of libpam, pam_strerror takes a single argument */ #ifdef HAVE_OLD_PAM # define PAM_STRERROR(a,b) pam_strerror((b)) @@ -525,27 +478,6 @@ struct winsize { ** login recorder definitions **/ -/* preprocess */ - -#ifdef HAVE_UTMP_H -# ifdef HAVE_TIME_IN_UTMP -# include <time.h> -# endif -# include <utmp.h> -#endif -#ifdef HAVE_UTMPX_H -# ifdef HAVE_TV_IN_UTMPX -# include <sys/time.h> -# endif -# include <utmpx.h> -#endif -#ifdef HAVE_LASTLOG_H -# include <lastlog.h> -#endif -#ifdef HAVE_PATHS_H -# include <paths.h> -#endif - /* FIXME: put default paths back in */ #ifndef UTMP_FILE # ifdef _PATH_UTMP |