diff --git a/src/backend/utils/adt/ip.c b/src/backend/utils/adt/ip.c
index b29339694b92e34372c3ff5bc515e8ec72217cc9..7828688d53f434fe2f4a5aadc6875a85f57aaccf 100644
--- a/src/backend/utils/adt/ip.c
+++ b/src/backend/utils/adt/ip.c
@@ -3,7 +3,7 @@
  *	is for IP V4 CIDR notation, but prepared for V6: just
  *	add the necessary bits where the comments indicate.
  *
- *	$Id: ip.c,v 1.1 1998/10/03 05:40:49 momjian Exp $
+ *	$Id: ip.c,v 1.2 1998/10/04 15:31:06 momjian Exp $
  */
 
 #include <sys/types.h>
@@ -266,7 +266,7 @@ ipaddr_cmp(ipaddr *a1, ipaddr *a2)
  */
 
 int
-v4bitncmp(u_int32_t a1, u_int32_t a2, int bits)
+v4bitncmp(unsigned int a1, unsigned int a2, int bits)
 {
 	unsigned long mask = 0;
 	int			i;
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index fd6f50e944459e7fa312e987cc68628e27780aee..9b3ca4c627c90dc2f725756bd479a56c62dc9118 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: builtins.h,v 1.56 1998/10/03 05:40:59 momjian Exp $
+ * $Id: builtins.h,v 1.57 1998/10/04 15:31:07 momjian Exp $
  *
  * NOTES
  *	  This should normally only be included by fmgr.h.
@@ -532,7 +532,7 @@ bool		ipaddr_subeq(ipaddr * a1, ipaddr * a2);
 bool		ipaddr_sup(ipaddr * a1, ipaddr * a2);
 bool		ipaddr_supeq(ipaddr * a1, ipaddr * a2);
 int4		ipaddr_cmp(ipaddr * a1, ipaddr * a2);
-int			v4bitncmp(u_int32_t a1, u_int32_t a2, int bits);
+int			v4bitncmp(unsigned int a1, unsigned int a2, int bits);
 
 
 /* mac.c */
diff --git a/src/include/utils/mac.h b/src/include/utils/mac.h
index 3ecb61cb460a86656689de2be5d31fb7032acfb1..df8a6762217667937e81fc83ddef69e042b9b240 100644
--- a/src/include/utils/mac.h
+++ b/src/include/utils/mac.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: mac.h,v 1.1 1998/10/03 05:41:01 momjian Exp $
+ * $Id: mac.h,v 1.2 1998/10/04 15:31:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,7 +23,7 @@ typedef struct
 	unsigned char bits;
 	union
 	{
-		u_int32_t	ipv4_addr;	/* network byte order */
+		unsigned int	ipv4_addr;	/* network byte order */
 		/* add IPV6 address type here */
 	}			addr;
 }			ipaddr_struct;