Merge branch 'master' of https://github.com/MariaDB/mariadb-connector-c

mariadb-corporation · Mar 2, 2016 · ea0f2e6 · ea0f2e6
2 parents e157d4f + 33ebe89
commit ea0f2e6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -214,6 +214,7 @@ IF(NOT WITH_SSL STREQUAL "OFF")
       ADD_DEFINITIONS(-DHAVE_OPENSSL -DHAVE_SSL)
       SET(SSL_SOURCES "${CMAKE_SOURCE_DIR}/libmariadb/secure/openssl.c")
       SET(SSL_LIBRARIES ${OPENSSL_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARIES})
+      INCLUDE_DIRECTORIES(BEFORE ${OPENSSL_INCLUDE_DIRS})
       MESSAGE(STATUS "OpenSSL version: ${OPENSSL_VERSION}")
     ELSE()
       MESSAGE(WARNING "OpenSSL not found")

diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt
@@ -273,6 +273,10 @@ IF(WIN32)
   INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/win-iconv)
   SET(LIBMARIADB_SOURCES ${LIBMARIADB_SOURCES}
                          ${CMAKE_SOURCE_DIR}/win-iconv/win_iconv.c)
+ELSE()
+  IF(ICONV_INCLUDE_DIR)
+     INCLUDE_DIRECTORIES(BEFORE ${ICONV_INCLUDE_DIR}) 
+  ENDIF()  
 ENDIF()
 
 IF(ZLIB_FOUND)

diff --git a/plugins/pvio/pvio_socket.c b/plugins/pvio/pvio_socket.c
@@ -521,7 +521,8 @@ int pvio_socket_wait_io_or_timeout(MARIADB_PVIO *pvio, my_bool is_read, int time
     else if (FD_ISSET(csock->socket, &exc_fds))
     {
       int err;
-      if (getsockopt(csock->socket, SOL_SOCKET, SO_ERROR, (char *)&err, sizeof(err)) != SOCKET_ERROR)
+      int len = sizeof(int);
+      if (getsockopt(csock->socket, SOL_SOCKET, SO_ERROR, (char *)&err, &len) != SOCKET_ERROR)
       {
         errno= err;
       }