summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian1998-10-04 15:31:09 +0000
committerBruce Momjian1998-10-04 15:31:09 +0000
commitf5a219204b090758ea724065fad41614333a2823 (patch)
tree11530dd53a24efaaa4dd0be0aa8daa8ed5f9176e
parent3f8bc47d6a7dfdaf6d4cb2b122af253ca4f0d793 (diff)
Remove u_int32_t
-rw-r--r--src/backend/utils/adt/ip.c4
-rw-r--r--src/include/utils/builtins.h4
-rw-r--r--src/include/utils/mac.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/utils/adt/ip.c b/src/backend/utils/adt/ip.c
index b29339694b..7828688d53 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 fd6f50e944..9b3ca4c627 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 3ecb61cb46..df8a676221 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;