CIDR/INET fixes from D'Arcy.

1 files changed, 4 insertions, 8 deletions

diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 430303b28d6..c6b4a816bc7 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.65 1998/10/22 04:58:11 momjian Exp $
+ * $Id: builtins.h,v 1.66 1998/10/22 13:16:27 momjian Exp $
  *
  * NOTES
  *	  This should normally only be included by fmgr.h.
@@ -511,20 +511,16 @@ extern text *translate(text *string, char from, char to);
 
 /* inet_net_ntop.c */
 char *inet_net_ntop(int af, const void *src, int bits, char *dst, size_t size);
+char *inet_cidr_ntop(int af, const void *src, int bits, char *dst, size_t size);
 
 /* inet_net_pton.c */
 int inet_net_pton(int af, const char *src, void *dst, size_t size);
 
-char *inet_cidr_ntop(int af, const void *src, size_t len, int bits, char *dst, size_t size);
-int inet_cidr_pton(int af, const void *src, void *dst, size_t size, int *used);
-
-/* cidr.c */
-inet	   *cidr_in(char *str);
-char	   *cidr_out(inet *addr);
-
 /* inet.c */
 inet	   *inet_in(char *str);
 char	   *inet_out(inet * addr);
+inet	   *cidr_in(char *str);
+char	   *cidr_out(inet *addr);
 bool		inet_lt(inet * a1, inet * a2);
 bool		inet_le(inet * a1, inet * a2);
 bool		inet_eq(inet * a1, inet * a2);