aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2010-11-12 12:01:00 +0100
committerIngela Anderton Andin <[email protected]>2010-11-12 12:01:00 +0100
commit7bfe74c3aca1a676a989d33e27059b59bad083c5 (patch)
treee1d41fbe39faa1e7b441c049d396ab6a79518d9f /lib
parent7edc140cb952137672e82f7dc8d7f100660d86f5 (diff)
parentfe884c86032a1c638f95a6f4d3aad039dcf5503e (diff)
downloadotp-7bfe74c3aca1a676a989d33e27059b59bad083c5.tar.gz
otp-7bfe74c3aca1a676a989d33e27059b59bad083c5.tar.bz2
otp-7bfe74c3aca1a676a989d33e27059b59bad083c5.zip
Merge branch 'ia/odbc/windows_fix' into dev
* ia/odbc/windows_fix: Added needed include file ws2tcpip.h for windows.
Diffstat (limited to 'lib')
-rw-r--r--lib/odbc/c_src/odbcserver.c2
-rw-r--r--lib/odbc/configure.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/odbc/c_src/odbcserver.c b/lib/odbc/c_src/odbcserver.c
index 84b9a99192..077d78bfe5 100644
--- a/lib/odbc/c_src/odbcserver.c
+++ b/lib/odbc/c_src/odbcserver.c
@@ -108,8 +108,8 @@
#if defined WIN32
#include <winsock2.h>
-/* #include <ws2tcpip.h > When we can support a newer c-compiler*/
#include <windows.h>
+#include <ws2tcpip.h >
#include <fcntl.h>
#include <sql.h>
#include <sqlext.h>
diff --git a/lib/odbc/configure.in b/lib/odbc/configure.in
index c16d4f3880..2369e16813 100644
--- a/lib/odbc/configure.in
+++ b/lib/odbc/configure.in
@@ -126,7 +126,7 @@ AC_TYPE_SIZE_T
AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_addr], [], [],
[#if HAVE_WINSOCK2_H
#include <winsock2.h>
- #include <windows.h>
+ #include <ws2tcpip.h>
#else
#include <netinet/in.h>
#endif])