diff options
Diffstat (limited to 'include/base')
-rw-r--r-- | include/base/crit.h | 5 | ||||
-rw-r--r-- | include/base/ereport.h | 4 | ||||
-rw-r--r-- | include/base/file.h | 4 | ||||
-rw-r--r-- | include/base/pool.h | 4 | ||||
-rw-r--r-- | include/base/shexp.h | 4 | ||||
-rw-r--r-- | include/base/systems.h | 6 | ||||
-rw-r--r-- | include/base/systhr.h | 4 | ||||
-rw-r--r-- | include/base/util.h | 17 |
8 files changed, 5 insertions, 43 deletions
diff --git a/include/base/crit.h b/include/base/crit.h index ad0ed09a..03c46bab 100644 --- a/include/base/crit.h +++ b/include/base/crit.h @@ -24,11 +24,6 @@ #include "netsite.h" #endif /* !NETSITE_H */ -/* Define C interface */ -#ifndef PUBLIC_BASE_CRIT_H -#include "public/base/crit.h" -#endif /* !PUBLIC_BASE_CRIT_H */ - /* Define C++ interface */ #ifdef __cplusplus diff --git a/include/base/ereport.h b/include/base/ereport.h index e067a84e..9ef44e16 100644 --- a/include/base/ereport.h +++ b/include/base/ereport.h @@ -16,10 +16,6 @@ * Rob McCool */ -#ifndef PUBLIC_BASE_EREPORT_H -#include "public/base/ereport.h" -#endif /* !PUBLIC_BASE_EREPORT_H */ - /* --- Begin function prototypes --- */ #ifdef INTNSAPI diff --git a/include/base/file.h b/include/base/file.h index c4ff47c3..869cf3f8 100644 --- a/include/base/file.h +++ b/include/base/file.h @@ -19,10 +19,6 @@ #include "../netsite.h" #endif /* !NETSITE_H */ -#ifndef PUBLIC_BASE_FILE_H -#include "public/base/file.h" -#endif /* !PUBLIC_BASE_FILE_H */ - /* --- Begin function prototypes --- */ #ifdef INTNSAPI diff --git a/include/base/pool.h b/include/base/pool.h index 8c8bf91b..b883e24e 100644 --- a/include/base/pool.h +++ b/include/base/pool.h @@ -30,10 +30,6 @@ #include "netsite.h" #endif /* !NETSITE_H */ -#ifndef PUBLIC_BASE_POOL_H -#include "public/base/pool.h" -#endif /* !PUBLIC_BASE_POOL_H */ - /* --- Begin function prototypes --- */ #ifdef INTNSAPI diff --git a/include/base/shexp.h b/include/base/shexp.h index a1e68c3e..1ed6cf0d 100644 --- a/include/base/shexp.h +++ b/include/base/shexp.h @@ -72,10 +72,6 @@ #endif /* USE_REGEX */ #endif /* !MCC_PROXY */ -#ifndef PUBLIC_BASE_SHEXP_H -#include "public/base/shexp.h" -#endif /* !PUBLIC_BASE_SHEXP_H */ - /* --- Begin function prototypes --- */ #ifdef INTNSAPI diff --git a/include/base/systems.h b/include/base/systems.h index 1e77faf2..b1ce1188 100644 --- a/include/base/systems.h +++ b/include/base/systems.h @@ -256,7 +256,6 @@ #define NEED_SETEID_PROTO /* setegid, seteuid */ #define NET_SOCKETS #define SHMEM_MMAP_FLAGS MAP_SHARED -#define TCPLEN_T size_t #define USE_PIPE /* * define this if your C++ platform has separate inline functions for @@ -449,6 +448,7 @@ typedef void* PASSWD; #include "public/base/systems.h" #endif /* PUBLIC_BASE_SYSTEMS_H */ + /* --- Begin defaults for values not defined above --- */ #ifndef DAEMON_LISTEN_SIZE @@ -465,10 +465,6 @@ typedef void* PASSWD; #define CONSTVALSTRCAST #endif -#ifndef TCPLEN_T -#define TCPLEN_T int -#endif - #ifndef THROW_HACK #define THROW_HACK /* as nothing */ #endif diff --git a/include/base/systhr.h b/include/base/systhr.h index 12cae43c..7d7efee1 100644 --- a/include/base/systhr.h +++ b/include/base/systhr.h @@ -22,10 +22,6 @@ #ifdef THREAD_ANY -#ifndef PUBLIC_BASE_SYSTHR_H -#include "public/base/systhr.h" -#endif /* !PUBLIC_BASE_SYSTHR_H */ - /* --- Begin function prototypes --- */ #ifdef INTNSAPI diff --git a/include/base/util.h b/include/base/util.h index dfd26038..467247b2 100644 --- a/include/base/util.h +++ b/include/base/util.h @@ -17,9 +17,10 @@ * Rob McCool */ -#ifndef PUBLIC_BASE_UTIL_H -#include "public/base/util.h" -#endif /* !PUBLIC_BASE_UTIL_H */ +#ifndef PUBLIC_NSAPI_H +#include "public/nsapi.h" +#endif /* !PUBLIC_NSAPI_H */ + /* --- Begin common function prototypes --- */ @@ -68,20 +69,10 @@ NSPR_END_EXTERN_C #define util_strncasecmp INTutil_strncasecmp #define util_localtime INTutil_localtime -#ifdef NEED_STRCASECMP -#define util_strcasecmp INTutil_strcasecmp -#define strcasecmp INTutil_strcasecmp -#endif /* NEED_STRCASECMP */ - #ifdef NEED_STRINGS_H /* usually for strcasecmp */ #include <strings.h> #endif -#ifdef NEED_STRNCASECMP -#define util_strncasecmp INTutil_strncasecmp -#define strncasecmp INTutil_strncasecmp -#endif /* NEED_STRNCASECMP */ - #endif /* INTNSAPI */ #endif /* !BASE_UTIL_H */ |