diff --git a/SConstruct b/SConstruct
index ce5ab4bb8..59d40d5cc 100644
--- a/SConstruct
+++ b/SConstruct
@@ -271,8 +271,8 @@ if not conf.CheckLib(py_version_name):
     Exit(1)
 
 # On Solaris you need to use libsocket for socket ops
-if not conf.CheckLibWithHeader(None, 'sys/socket.h', 'C', 'accept(0,NULL,NULL);'):
-   if not conf.CheckLibWithHeader('socket', 'sys/socket.h', 'C', 'accept(0,NULL,NULL);'):
+if not conf.CheckLibWithHeader(None, 'sys/socket.h', 'C++', 'accept(0,0,0);'):
+   if not conf.CheckLibWithHeader('socket', 'sys/socket.h', 'C++', 'accept(0,0,0);'):
        print "Can't find library with socket calls (e.g. accept())"
        Exit(1)