diff --git a/mozilla/network/main/mkconect.c b/mozilla/network/main/mkconect.c index feb749441ca..4fc2cfecd3f 100644 --- a/mozilla/network/main/mkconect.c +++ b/mozilla/network/main/mkconect.c @@ -84,7 +84,7 @@ #include -#if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) +#if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) && !defined(DGUX) #include #endif diff --git a/mozilla/network/main/mksockrw.c b/mozilla/network/main/mksockrw.c index fd8afc49e35..936e14f200f 100644 --- a/mozilla/network/main/mksockrw.c +++ b/mozilla/network/main/mksockrw.c @@ -47,7 +47,7 @@ extern int XP_ERRNO_EWOULDBLOCK; #include -#if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) +#if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) && !defined(DGUX) #include #endif diff --git a/mozilla/network/protocol/ftp/mkftp.c b/mozilla/network/protocol/ftp/mkftp.c index a074a787e09..2172f1b2e0c 100644 --- a/mozilla/network/protocol/ftp/mkftp.c +++ b/mozilla/network/protocol/ftp/mkftp.c @@ -61,7 +61,7 @@ #endif /* XP_OS2 */ #ifdef XP_UNIX -#if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) +#if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) && !defined(DGUX) #include #endif #endif /* XP_UNIX */ diff --git a/mozilla/sun-java/stubs/include/typedefs_md.h b/mozilla/sun-java/stubs/include/typedefs_md.h index 1ffc1f211f8..5e17ac535e7 100644 --- a/mozilla/sun-java/stubs/include/typedefs_md.h +++ b/mozilla/sun-java/stubs/include/typedefs_md.h @@ -28,7 +28,7 @@ PR_BEGIN_EXTERN_C -#if (defined(__sun) && !defined(SOLARIS2_6)) || defined(HPUX9) || defined(HPUX10_10) || defined(XP_PC) || defined(AIX) || defined(OSF1) || defined(XP_MAC) || defined(SONY) || defined(SNI) || defined(UNIXWARE) || defined(LINUX) +#if (defined(__sun) && !defined(SOLARIS2_6)) || defined(HPUX9) || defined(HPUX10_10) || defined(XP_PC) || defined(AIX) || defined(OSF1) || defined(XP_MAC) || defined(SONY) || defined(SNI) || defined(UNIXWARE) || defined(LINUX) || defined(DGUX) typedef int16 int16_t; typedef int32 int32_t; #endif