From 491b3b39d5e79a2dafe164c942383efa7dc6201d Mon Sep 17 00:00:00 2001
From: Elizabeth Myers <elizabeth@interlinked.me>
Date: Wed, 23 Mar 2016 22:03:24 -0500
Subject: [PATCH] cleanup: u_long -> unsigned long

---
 librb/include/rb_lib.h      | 2 +-
 librb/include/rb_patricia.h | 1 -
 librb/src/crypt.c           | 2 +-
 librb/src/win32.c           | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/librb/include/rb_lib.h b/librb/include/rb_lib.h
index bc4eb502a..ed0a344fe 100644
--- a/librb/include/rb_lib.h
+++ b/librb/include/rb_lib.h
@@ -113,7 +113,7 @@ char *rb_strerror(int error);
 #define EAFNOSUPPORT WSAEAFNOSUPPORT
 
 #define pipe(x)  _pipe(x, 1024, O_BINARY)
-#define ioctl(x,y,z)  ioctlsocket(x,y, (u_long *)z)
+#define ioctl(x,y,z)  ioctlsocket(x,y, (unsigned long *)z)
 
 #define WNOHANG 1
 
diff --git a/librb/include/rb_patricia.h b/librb/include/rb_patricia.h
index 6f2753af7..79b9fecb4 100644
--- a/librb/include/rb_patricia.h
+++ b/librb/include/rb_patricia.h
@@ -24,7 +24,6 @@
 #define INET6_ADDRSTRLEN 46
 #endif
 
-/* typedef unsigned int u_int; */
 #define rb_prefix_touchar(prefix) ((unsigned char *)&(prefix)->add.sin)
 #define MAXLINE 1024
 #define BIT_TEST(f, b)  ((f) & (b))
diff --git a/librb/src/crypt.c b/librb/src/crypt.c
index 4b807c7ef..9344e988d 100644
--- a/librb/src/crypt.c
+++ b/librb/src/crypt.c
@@ -754,7 +754,7 @@ rb_des_crypt(const char *key, const char *setting)
 #define MD5_SIZE			16
 
 static void
-_crypt_to64(char *s, u_long v, int n)
+_crypt_to64(char *s, unsigned long v, int n)
 {
 	while (--n >= 0) {
 	        *s++ = ascii64[v&0x3f];
diff --git a/librb/src/win32.c b/librb/src/win32.c
index b43b8f6da..a3b8ceaaf 100644
--- a/librb/src/win32.c
+++ b/librb/src/win32.c
@@ -414,7 +414,7 @@ rb_setup_fd_win32(rb_fde_t *F)
 	{
 	case RB_FD_SOCKET:
 		{
-			u_long nonb = 1;
+			unsigned long nonb = 1;
 			if(ioctlsocket((SOCKET) F->fd, FIONBIO, &nonb) == -1)
 			{
 				rb_get_errno();