summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtc%netscape.com <devnull@localhost>2002-04-11 18:14:39 +0000
committerwtc%netscape.com <devnull@localhost>2002-04-11 18:14:39 +0000
commitbd79e89fdac153480abdae5a9f1d4d5ada524e8a (patch)
treef99c287a100066f2b9771c2daf51f5eb81df7e10
parenta4948a221f98f19f95b00cb1517fbfaf904e4f05 (diff)
downloadnspr-hg-bd79e89fdac153480abdae5a9f1d4d5ada524e8a.tar.gz
Bugzilla bug 135119: fixed compilation problems on Linux Alpha. r=cls.
a=rjesup@wgate.com for check into the mozilla 1.0.0 branch.
-rw-r--r--pr/src/pthreads/ptio.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/pr/src/pthreads/ptio.c b/pr/src/pthreads/ptio.c
index c4a7a53a..61e75a0d 100644
--- a/pr/src/pthreads/ptio.c
+++ b/pr/src/pthreads/ptio.c
@@ -179,8 +179,6 @@ static ssize_t (*pt_aix_sendfile_fptr)() = NULL;
#include "primpl.h"
-/* On Alpha Linux, these are already defined in sys/socket.h */
-#if !(defined(LINUX) && defined(__alpha))
#include <netinet/tcp.h> /* TCP_NODELAY, TCP_MAXSEG */
#ifdef LINUX
/* TCP_CORK is not defined in <netinet/tcp.h> on Red Hat Linux 6.0 */
@@ -188,7 +186,6 @@ static ssize_t (*pt_aix_sendfile_fptr)() = NULL;
#define TCP_CORK 3
#endif
#endif
-#endif
#if defined(SOLARIS)
#define _PRSockOptVal_t char *
@@ -291,11 +288,9 @@ static PRBool IsValidNetAddrLen(const PRNetAddr *addr, PRInt32 addr_len)
* most current systems.
*/
#if defined(HAVE_SOCKLEN_T) \
- || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2 \
- && !defined(__alpha))
+ || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
typedef socklen_t pt_SockLen;
#elif (defined(AIX) && !defined(AIX4_1)) \
- || (defined(LINUX) && defined(__alpha)) \
|| defined(VMS)
typedef PRSize pt_SockLen;
#else