Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit f5a2192

Browse files
committed
Remove u_int32_t
1 parent 3f8bc47 commit f5a2192

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/backend/utils/adt/ip.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* is for IP V4 CIDR notation, but prepared for V6: just
44
* add the necessary bits where the comments indicate.
55
*
6-
* $Id: ip.c,v 1.1 1998/10/03 05:40:49 momjian Exp $
6+
* $Id: ip.c,v 1.2 1998/10/04 15:31:06 momjian Exp $
77
*/
88

99
#include <sys/types.h>
@@ -266,7 +266,7 @@ ipaddr_cmp(ipaddr *a1, ipaddr *a2)
266266
*/
267267

268268
int
269-
v4bitncmp(u_int32_t a1, u_int32_t a2, int bits)
269+
v4bitncmp(unsigned int a1, unsigned int a2, int bits)
270270
{
271271
unsigned long mask = 0;
272272
int i;

src/include/utils/builtins.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: builtins.h,v 1.56 1998/10/03 05:40:59 momjian Exp $
9+
* $Id: builtins.h,v 1.57 1998/10/04 15:31:07 momjian Exp $
1010
*
1111
* NOTES
1212
* This should normally only be included by fmgr.h.
@@ -532,7 +532,7 @@ bool ipaddr_subeq(ipaddr * a1, ipaddr * a2);
532532
bool ipaddr_sup(ipaddr * a1, ipaddr * a2);
533533
bool ipaddr_supeq(ipaddr * a1, ipaddr * a2);
534534
int4 ipaddr_cmp(ipaddr * a1, ipaddr * a2);
535-
int v4bitncmp(u_int32_t a1, u_int32_t a2, int bits);
535+
int v4bitncmp(unsigned int a1, unsigned int a2, int bits);
536536

537537

538538
/* mac.c */

src/include/utils/mac.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: mac.h,v 1.1 1998/10/03 05:41:01 momjian Exp $
9+
* $Id: mac.h,v 1.2 1998/10/04 15:31:09 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -23,7 +23,7 @@ typedef struct
2323
unsigned char bits;
2424
union
2525
{
26-
u_int32_t ipv4_addr; /* network byte order */
26+
unsigned int ipv4_addr; /* network byte order */
2727
/* add IPV6 address type here */
2828
} addr;
2929
} ipaddr_struct;

0 commit comments

Comments
 (0)