Deleted Added
full compact
29c29
< static char privatehid[] = "@(#)private.h 7.5";
---
> /*static char privatehid[] = "@(#)private.h 7.33";*/
34c34,35
< ** const
---
> ** Defaults for preprocessor symbols.
> ** You can override these in your C compiler options, e.g. `-DHAVE_ADJTIME=0'.
37,41c38,40
< #ifndef const
< #ifndef __STDC__
< #define const
< #endif /* !defined __STDC__ */
< #endif /* !defined const */
---
> #ifndef HAVE_ADJTIME
> #define HAVE_ADJTIME 1
> #endif /* !defined HAVE_ADJTIME */
42a42,49
> #ifndef HAVE_SETTIMEOFDAY
> #define HAVE_SETTIMEOFDAY 3
> #endif /* !defined HAVE_SETTIMEOFDAY */
>
> #ifndef HAVE_UNISTD_H
> #define HAVE_UNISTD_H 1
> #endif /* !defined HAVE_UNISTD_H */
>
44c51
< ** void
---
> ** Nested includes
47c54,84
< #ifndef void
---
> #include "sys/types.h" /* for time_t */
> #include "stdio.h"
> #include "ctype.h"
> #include "errno.h"
> #include "string.h"
> #include "limits.h" /* for CHAR_BIT */
> #include "time.h"
> #include "stdlib.h"
>
> #if HAVE_UNISTD_H - 0
> #include "unistd.h" /* for F_OK and R_OK */
> #endif /* HAVE_UNISTD_H - 0 */
>
> #if !(HAVE_UNISTD_H - 0)
> #ifndef F_OK
> #define F_OK 0
> #endif /* !defined F_OK */
> #ifndef R_OK
> #define R_OK 4
> #endif /* !defined R_OK */
> #endif /* !(HAVE_UNISTD_H - 0) */
>
> /*
> ** Workarounds for compilers/systems.
> */
>
> /*
> ** SunOS 4.1.1 cc lacks const.
> */
>
> #ifndef const
49,53c86
< #ifndef vax
< #ifndef sun
< #define void char
< #endif /* !defined sun */
< #endif /* !defined vax */
---
> #define const
55c88
< #endif /* !defined void */
---
> #endif /* !defined const */
58c91
< ** P((args))
---
> ** SunOS 4.1.1 cc lacks prototypes.
66,67c99
< #define ASTERISK *
< #define P(x) ( /ASTERISK x ASTERISK/ )
---
> #define P(x) ()
72c104
< ** genericptr_t
---
> ** SunOS 4.1.1 headers lack EXIT_SUCCESS.
75,80c107,109
< #ifdef __STDC__
< typedef void * genericptr_t;
< #endif /* defined __STDC__ */
< #ifndef __STDC__
< typedef char * genericptr_t;
< #endif /* !defined __STDC__ */
---
> #ifndef EXIT_SUCCESS
> #define EXIT_SUCCESS 0
> #endif /* !defined EXIT_SUCCESS */
82,90c111,113
< #include "sys/types.h" /* for time_t */
< #include "stdio.h"
< #include "ctype.h"
< #include "errno.h"
< #include "string.h"
< #include "limits.h" /* for CHAR_BIT */
< #ifndef _TIME_
< #include "time.h"
< #endif /* !defined _TIME_ */
---
> /*
> ** SunOS 4.1.1 headers lack EXIT_FAILURE.
> */
92,95c115,117
< #ifndef remove
< extern int unlink P((const char * filename));
< #define remove unlink
< #endif /* !defined remove */
---
> #ifndef EXIT_FAILURE
> #define EXIT_FAILURE 1
> #endif /* !defined EXIT_FAILURE */
96a119,122
> /*
> ** SunOS 4.1.1 headers lack FILENAME_MAX.
> */
>
114,116c140,142
< #ifndef EXIT_SUCCESS
< #define EXIT_SUCCESS 0
< #endif /* !defined EXIT_SUCCESS */
---
> /*
> ** SunOS 4.1.1 libraries lack remove.
> */
118,120c144,147
< #ifndef EXIT_FAILURE
< #define EXIT_FAILURE 1
< #endif /* !defined EXIT_FAILURE */
---
> #ifndef remove
> extern int unlink P((const char * filename));
> #define remove unlink
> #endif /* !defined remove */
122,153d148
< #ifdef __STDC__
<
< #define alloc_size_t size_t
< #define qsort_size_t size_t
< #define fwrite_size_t size_t
<
< #endif /* defined __STDC__ */
< #ifndef __STDC__
<
< #ifndef alloc_size_t
< #define alloc_size_t unsigned
< #endif /* !defined alloc_size_t */
<
< #ifndef qsort_size_t
< #ifdef USG
< #define qsort_size_t unsigned
< #endif /* defined USG */
< #ifndef USG
< #define qsort_size_t int
< #endif /* !defined USG */
< #endif /* !defined qsort_size_t */
<
< #ifndef fwrite_size_t
< #define fwrite_size_t int
< #endif /* !defined fwrite_size_t */
<
< #ifndef USG
< extern char * sprintf P((char * buf, const char * format, ...));
< #endif /* !defined USG */
<
< #endif /* !defined __STDC__ */
<
155c150
< ** Ensure that these are declared--redundantly declaring them shouldn't hurt.
---
> ** Finally, some convenience items.
158,170d152
< extern char * getenv P((const char * name));
< extern genericptr_t malloc P((alloc_size_t size));
< extern genericptr_t calloc P((alloc_size_t nelem, alloc_size_t elsize));
< extern genericptr_t realloc P((genericptr_t oldptr, alloc_size_t newsize));
<
< #ifdef USG
< extern void exit P((int s));
< extern void qsort P((genericptr_t base, qsort_size_t nelem,
< qsort_size_t elsize, int (*comp)()));
< extern void perror P((const char * string));
< extern void free P((char * buf));
< #endif /* defined USG */
<
191,192c173
< ** UNIX is a registered trademark of AT&T.
< ** VAX is a trademark of Digital Equipment Corporation.
---
> ** INITIALIZE(x)
194a176,199
> #ifndef GNUC_or_lint
> #ifdef lint
> #define GNUC_or_lint
> #endif /* defined lint */
> #ifndef lint
> #ifdef __GNUC__
> #define GNUC_or_lint
> #endif /* defined __GNUC__ */
> #endif /* !defined lint */
> #endif /* !defined GNUC_or_lint */
>
> #ifndef INITIALIZE
> #ifdef GNUC_or_lint
> #define INITIALIZE(x) ((x) = 0)
> #endif /* defined GNUC_or_lint */
> #ifndef GNUC_or_lint
> #define INITIALIZE(x)
> #endif /* !defined GNUC_or_lint */
> #endif /* !defined INITIALIZE */
>
> /*
> ** UNIX was a registered trademark of UNIX System Laboratories in 1993.
> */
>