diff options
| author | wtc%netscape.com <devnull@localhost> | 1999-01-26 05:23:03 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 1999-01-26 05:23:03 +0000 |
| commit | be8886c0c9dda78af92d492ec563e4b40e8af594 (patch) | |
| tree | 9056351dcfdfb768be5d217ab142254a26abaf20 | |
| parent | ae64f054e7eea5b4d86697e36e38aaa33b7ba435 (diff) | |
| download | nspr-hg-be8886c0c9dda78af92d492ec563e4b40e8af594.tar.gz | |
Dealt with the definitions of the obsolete integer types that
conflict with the typedefs in BeOS's <support/SupportDefs.h>.
(Acknowledgment: Matthew Zahorik <maz@albany.net>)
| -rw-r--r-- | pr/include/obsolete/protypes.h | 21 | ||||
| -rw-r--r-- | pr/include/prtypes.h | 4 |
2 files changed, 16 insertions, 9 deletions
diff --git a/pr/include/obsolete/protypes.h b/pr/include/obsolete/protypes.h index e70b03b4..82fc629c 100644 --- a/pr/include/obsolete/protypes.h +++ b/pr/include/obsolete/protypes.h @@ -26,6 +26,20 @@ #if !defined(PROTYPES_H) #define PROTYPES_H +typedef PRUintn uintn; +#ifndef _XP_Core_ +typedef PRIntn intn; +#endif + +/* + * BeOS already defines the integer types below in its standard + * header file SupportDefs.h. + */ +#ifdef XP_BEOS + +#include <support/SupportDefs.h> + +#else /* XP_BEOS */ /* SVR4 typedef of uint is commonly found on UNIX machines. */ #ifdef XP_UNIX @@ -34,7 +48,6 @@ typedef PRUintn uint; #endif -typedef PRUintn uintn; typedef PRUint64 uint64; #if !defined(XP_MAC) && !defined(_WIN32) && !defined(XP_OS2) typedef PRUint32 uint32; @@ -44,10 +57,6 @@ typedef unsigned long uint32; typedef PRUint16 uint16; typedef PRUint8 uint8; -#ifndef _XP_Core_ -typedef PRIntn intn; -#endif - /* * On AIX 4.3, sys/inttypes.h (which is included by sys/types.h, a very * common header file) defines the types int8, int16, int32, and int64. @@ -75,6 +84,8 @@ typedef PRInt8 int8; #endif /* HPUX */ #endif /* AIX4_3 */ +#endif /* XP_BEOS */ + typedef PRFloat64 float64; typedef PRUptrdiff uptrdiff_t; typedef PRUword uprword_t; diff --git a/pr/include/prtypes.h b/pr/include/prtypes.h index d1ab7a3d..3523cfa0 100644 --- a/pr/include/prtypes.h +++ b/pr/include/prtypes.h @@ -35,10 +35,6 @@ #include "prcpucfg.h" -#ifdef XP_BEOS -#include <support/SupportDefs.h> -#endif - #include <stddef.h> /*********************************************************************** |