diff --git a/configure.in b/configure.in
index ab444e32fb..9f90291499 100644
--- a/configure.in
+++ b/configure.in
@@ -4951,6 +4951,10 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
     dnl like mingw does..  -- RL
     if test "$TOOLKIT" != "MSW"; then
         dnl determine the type of third argument for getsockname
+	dnl This test needs to be done in C++ mode since gsocket.cpp now
+	dnl is C++ code and pointer cast that are possible even without
+	dnl warning in C still fail in C++.
+	AC_LANG_PUSH(C++)
         AC_CACHE_CHECK([what is the type of the third argument of getsockname],
                        wx_cv_type_getsockname3,
             [
@@ -5011,6 +5015,7 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
         else
             AC_DEFINE_UNQUOTED(SOCKLEN_T, $wx_cv_type_getsockname3)
         fi
+	AC_LANG_POP
     fi
 fi