diff --git a/checkin_notes b/checkin_notes
index 02f830fc7b..54db0b7bac 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -3995,7 +3995,7 @@ David  22 May 2012
         stats.cpp
         ssim.php
 
-David  22 May 2012
+David  23 May 2012
     - server daemons: add daemon_sleep(n), which sleeps for n secs
         but checks for the "stop_daemons" trigger file every 1 sec.
         Use this instead of sleep() in daemons.
@@ -4004,3 +4004,10 @@ David  22 May 2012
     sched/
         sched_util.cpp,h
         (daemons).cpp
+
+David  23 May 2012
+    - get rid of BOINC_SOCKLEN_T stuff; just use socklen_t
+
+    configure.ac
+    lib/
+        network.h
diff --git a/configure.ac b/configure.ac
index 7269c3df0d..1de347370a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -379,9 +379,6 @@ case ${target} in
 	;;
 esac
 
-dnl m4/boinc_getsockopt.m4
-BOINC_GETSOCKOPT_TYPE
-
 if test "x${enable_fcgi}" = xyes ; then
 dnl m4/boinc_check_fcgi.m4
 BOINC_CHECK_FCGI
diff --git a/lib/network.h b/lib/network.h
index ff5287773f..ec43de197a 100644
--- a/lib/network.h
+++ b/lib/network.h
@@ -54,9 +54,7 @@ extern int get_socket_error(int fd);
 extern const char* socket_error_str();
 extern void reset_dns();
 
-#if defined(_WIN32) && defined(USE_WINSOCK)
-typedef int BOINC_SOCKLEN_T;
-#endif
+typedef socklen_t BOINC_SOCKLEN_T;
 
 #if defined(_WIN32) && defined(USE_WINSOCK)
 extern int WinsockInitialize();