diff options
| author | wtc <devnull@localhost> | 1998-06-08 23:45:45 +0000 |
|---|---|---|
| committer | wtc <devnull@localhost> | 1998-06-08 23:45:45 +0000 |
| commit | b7b1c47abdc39394d80772b655273f984a6bfab0 (patch) | |
| tree | 4e1d6ce69f78aae833dad806059f2ad6a9f4de28 | |
| parent | 410f607faf2dd9fc91131c5503abceabca2c227e (diff) | |
| download | nspr-hg-b7b1c47abdc39394d80772b655273f984a6bfab0.tar.gz | |
On HP-UX, we should just include <model.h> and use its definition
of the types int8, int16, and int32. This way people can include
nspr header and model.h in any order and won't get "type defined
twice" errors.
| -rw-r--r-- | pr/include/obsolete/protypes.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pr/include/obsolete/protypes.h b/pr/include/obsolete/protypes.h index 676d848b..8b9bc645 100644 --- a/pr/include/obsolete/protypes.h +++ b/pr/include/obsolete/protypes.h @@ -57,7 +57,9 @@ typedef PRIntn intn; typedef PRInt64 int64; /* /usr/include/model.h on HP-UX defines int8, int16, and int32 */ -#if !defined(HPUX) || !defined(_MODEL_INCLUDED) +#if defined(HPUX) +#include <model.h> +#else #if !defined(WIN32) || !defined(_WINSOCK2API_) /* defines its own "int32" */ #if !defined(XP_MAC) && !defined(_WIN32) && !defined(XP_OS2) typedef PRInt32 int32; @@ -67,7 +69,7 @@ typedef long int32; #endif typedef PRInt16 int16; typedef PRInt8 int8; -#endif /* !defined(HPUX) || !defined(_MODEL_INCLUDED) */ +#endif /* HPUX */ #endif /* AIX4_3 */ typedef PRFloat64 float64; |