diff --git a/ChangeLog b/ChangeLog
index c3ed1cb946..d2af84d4e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jan 31 17:01:47 2014  Eric Wong <e@80x24.org>
+
+	* ext/socket/init.c (rsock_socket0): split out SOCK_CLOEXEC version
+	* ext/socket/socket.c (rsock_socketpair0): ditto
+	  [ruby-core:60377]
+
 Fri Jan 31 03:48:40 2014  Eric Wong <e@80x24.org>
 
 	* benchmark/driver: avoid large alloc in driver process
diff --git a/ext/socket/init.c b/ext/socket/init.c
index 313e11bdf9..dc6b531bd6 100644
--- a/ext/socket/init.c
+++ b/ext/socket/init.c
@@ -264,12 +264,11 @@ int rsock_detect_cloexec(int fd)
     return 0;
 }
 
+#ifdef SOCK_CLOEXEC
 static int
 rsock_socket0(int domain, int type, int proto)
 {
     int ret;
-
-#ifdef SOCK_CLOEXEC
     static int cloexec_state = -1; /* <0: unknown, 0: ignored, >0: working */
 
     if (cloexec_state > 0) { /* common path, if SOCK_CLOEXEC is defined */
@@ -300,22 +299,28 @@ rsock_socket0(int domain, int type, int proto)
     else { /* cloexec_state == 0 */
         ret = socket(domain, type, proto);
     }
-#else
-    ret = socket(domain, type, proto);
-#endif
     if (ret == -1)
         return -1;
-#ifdef SOCK_CLOEXEC
 fix_cloexec:
-#endif
     rb_maygvl_fd_fix_cloexec(ret);
-#ifdef SOCK_CLOEXEC
 update_max_fd:
-#endif
     rb_update_max_fd(ret);
 
     return ret;
 }
+#else /* !SOCK_CLOEXEC */
+static int
+rsock_socket0(int domain, int type, int proto)
+{
+    int ret = socket(domain, type, proto);
+
+    if (ret == -1)
+        return -1;
+    rb_fd_fix_cloexec(ret);
+
+    return ret;
+}
+#endif /* !SOCK_CLOEXEC */
 
 int
 rsock_socket(int domain, int type, int proto)
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 31ac120c9d..d13b7e9dbc 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -168,12 +168,11 @@ pair_yield(VALUE pair)
 
 #if defined HAVE_SOCKETPAIR
 
+#ifdef SOCK_CLOEXEC
 static int
 rsock_socketpair0(int domain, int type, int protocol, int sv[2])
 {
     int ret;
-
-#ifdef SOCK_CLOEXEC
     static int cloexec_state = -1; /* <0: unknown, 0: ignored, >0: working */
 
     if (cloexec_state > 0) { /* common path, if SOCK_CLOEXEC is defined */
@@ -206,28 +205,34 @@ rsock_socketpair0(int domain, int type, int protocol, int sv[2])
     else { /* cloexec_state == 0 */
         ret = socketpair(domain, type, protocol, sv);
     }
-#else
-    ret = socketpair(domain, type, protocol, sv);
-#endif
-
     if (ret == -1) {
         return -1;
     }
 
-#ifdef SOCK_CLOEXEC
 fix_cloexec:
-#endif
     rb_maygvl_fd_fix_cloexec(sv[0]);
     rb_maygvl_fd_fix_cloexec(sv[1]);
 
-#ifdef SOCK_CLOEXEC
 update_max_fd:
-#endif
     rb_update_max_fd(sv[0]);
     rb_update_max_fd(sv[1]);
 
     return ret;
 }
+#else /* !SOCK_CLOEXEC */
+static int
+rsock_socketpair0(int domain, int type, int protocol, int sv[2])
+{
+    int ret = socketpair(domain, type, protocol, sv);
+
+    if (ret == -1)
+	return -1;
+
+    rb_fd_fix_cloexec(sv[0]);
+    rb_fd_fix_cloexec(sv[1]);
+    return ret;
+}
+#endif /* !SOCK_CLOEXEC */
 
 static int
 rsock_socketpair(int domain, int type, int protocol, int sv[2])