diff --git a/configure.ac b/configure.ac
index beb928f43d74a0933911a13613efec82bddf3faa..61a3c48f042b97e765ecab5f259198c2831d9531 100644
--- a/configure.ac
+++ b/configure.ac
@@ -399,6 +399,9 @@ AH_TEMPLATE(HAVE_ADDRINFO, [Define to `1' if <netdb.h> defines struct addrinfo.]
 AC_CHECK_TYPES([struct addrinfo],[AC_DEFINE(HAVE_ADDRINFO)],,
 [#include <sys/types.h>
 #if defined( WIN32 ) || defined( UNDER_CE )
+# if defined(UNDER_CE) && defined(sockaddr_storage)
+#  undef sockaddr_storage
+# endif
 # include <winsock2.h>
 # include <ws2tcpip.h>
 #else