From 5d389dc0f0acd8077b51eb053bb98bc4c1b3baa4 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 26 Oct 2010 22:27:57 -0400
Subject: [PATCH] Fix some uses of int for socket in regress

---
 test/regress.c      | 2 +-
 test/regress.h      | 4 ++--
 test/regress_main.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/regress.c b/test/regress.c
index 0cc40170..71327559 100644
--- a/test/regress.c
+++ b/test/regress.c
@@ -72,7 +72,7 @@
 #include "regress.gen.h"
 #endif
 
-int pair[2];
+evutil_socket_t pair[2];
 int test_ok;
 int called;
 struct event_base *global_base;
diff --git a/test/regress.h b/test/regress.h
index f66b4ce0..ddaadec7 100644
--- a/test/regress.h
+++ b/test/regress.h
@@ -56,7 +56,7 @@ void regress_threads(void *);
 void test_bufferevent_zlib(void *);
 
 /* Helpers to wrap old testcases */
-extern int pair[2];
+extern evutil_socket_t pair[2];
 extern int test_ok;
 extern int called;
 extern struct event_base *global_base;
@@ -66,7 +66,7 @@ evutil_socket_t regress_make_tmpfile(const void *data, size_t datalen);
 
 struct basic_test_data {
 	struct event_base *base;
-	int pair[2];
+	evutil_socket_t pair[2];
 
 	void (*legacy_test_fn)(void);
 
diff --git a/test/regress_main.c b/test/regress_main.c
index db95f305..ca41333a 100644
--- a/test/regress_main.c
+++ b/test/regress_main.c
@@ -162,7 +162,7 @@ static void *
 basic_test_setup(const struct testcase_t *testcase)
 {
 	struct event_base *base = NULL;
-	int spair[2] = { -1, -1 };
+	evutil_socket_t spair[2] = { -1, -1 };
 	struct basic_test_data *data = NULL;
 
 #ifndef WIN32