From 1d0085e47a15c56b389b0914c0a7e1e3e6d24db3 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Fri, 12 Sep 1997 22:22:12 +0000 Subject: [PATCH] Dec alphaserver patch from Malcolm Beattie --- src/backend/libpq/pqcomprim.c | 10 +++++----- src/backend/port/inet_aton.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/backend/libpq/pqcomprim.c b/src/backend/libpq/pqcomprim.c index 594bb2b98a..a3bdd26c0e 100644 --- a/src/backend/libpq/pqcomprim.c +++ b/src/backend/libpq/pqcomprim.c @@ -27,7 +27,7 @@ #if BYTE_ORDER == BIG_ENDIAN #define ntoh_s(n) (u_short)(((u_char *)&n)[1] << 8 \ | ((u_char *)&n)[0]) -#define ntoh_l(n) (u_long) (((u_char *)&n)[3] << 24 \ +#define ntoh_l(n) (uint32) (((u_char *)&n)[3] << 24 \ | ((u_char *)&n)[2] << 16 \ | ((u_char *)&n)[1] << 8 \ | ((u_char *)&n)[0]) @@ -65,10 +65,10 @@ int pqPutLong(int integer, FILE *f) { int retval = 0; - u_long n; + uint32 n; n = hton_l(integer); - if (fwrite(&n, sizeof(u_long), 1, f) != 1) + if (fwrite(&n, sizeof(uint32), 1, f) != 1) retval = EOF; return retval; @@ -93,9 +93,9 @@ int pqGetLong(int *result, FILE *f) { int retval = 0; - u_long n; + uint32 n; - if (fread(&n, sizeof(u_long), 1, f) != 1) + if (fread(&n, sizeof(uint32), 1, f) != 1) retval = EOF; *result = ntoh_l(n); diff --git a/src/backend/port/inet_aton.c b/src/backend/port/inet_aton.c index f1283e6e6b..0220507a52 100644 --- a/src/backend/port/inet_aton.c +++ b/src/backend/port/inet_aton.c @@ -57,7 +57,7 @@ int inet_aton(const char *cp, struct in_addr * addr) { - register u_long val; + register uint32 val; register int base, n; register char c;