You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
71 lines
2.4 KiB
71 lines
2.4 KiB
This file is part of MXE.
|
|
See index.html for further information.
|
|
|
|
From cbbcedc1a44012a46498c26885702915a0093a6c Mon Sep 17 00:00:00 2001
|
|
From: Boris Nagaev <bnagaev@gmail.com>
|
|
Date: Mon, 7 Sep 2015 22:59:18 +0100
|
|
Subject: [PATCH 3/5] fix case in headers and libs (should be lowercase)
|
|
|
|
---
|
|
extra/yassl/src/yassl_int.cpp | 2 +-
|
|
include/mysql/psi/mysql_socket.h | 2 +-
|
|
libmysql/authentication_win/CMakeLists.txt | 2 +-
|
|
libmysql/authentication_win/plugin_client.cc | 2 +-
|
|
4 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/extra/yassl/src/yassl_int.cpp b/extra/yassl/src/yassl_int.cpp
|
|
index 2993a1a..04b1fda 100644
|
|
--- a/extra/yassl/src/yassl_int.cpp
|
|
+++ b/extra/yassl/src/yassl_int.cpp
|
|
@@ -20,7 +20,7 @@
|
|
// First include (the generated) my_config.h, to get correct platform defines.
|
|
#include "my_config.h"
|
|
#ifdef _WIN32
|
|
-#include<Windows.h>
|
|
+#include<windows.h>
|
|
#else
|
|
#include <pthread.h>
|
|
#endif
|
|
diff --git a/include/mysql/psi/mysql_socket.h b/include/mysql/psi/mysql_socket.h
|
|
index 41a7cb4..5f6d91d 100644
|
|
--- a/include/mysql/psi/mysql_socket.h
|
|
+++ b/include/mysql/psi/mysql_socket.h
|
|
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
|
|
#ifdef _WIN32
|
|
#include <ws2def.h>
|
|
#include <winsock2.h>
|
|
- #include <MSWSock.h>
|
|
+ #include <mswsock.h>
|
|
#define SOCKBUF_T char
|
|
#else
|
|
#include <netinet/in.h>
|
|
diff --git a/libmysql/authentication_win/CMakeLists.txt b/libmysql/authentication_win/CMakeLists.txt
|
|
index f2979fb..83e5441 100644
|
|
--- a/libmysql/authentication_win/CMakeLists.txt
|
|
+++ b/libmysql/authentication_win/CMakeLists.txt
|
|
@@ -26,7 +26,7 @@ SET(HEADERS common.h handshake.h)
|
|
SET(PLUGIN_SOURCES plugin_client.cc handshake_client.cc log_client.cc common.cc handshake.cc)
|
|
|
|
ADD_CONVENIENCE_LIBRARY(auth_win_client ${PLUGIN_SOURCES} ${HEADERS})
|
|
-TARGET_LINK_LIBRARIES(auth_win_client Secur32)
|
|
+TARGET_LINK_LIBRARIES(auth_win_client secur32)
|
|
|
|
# In IDE, group headers in a separate folder.
|
|
|
|
diff --git a/libmysql/authentication_win/plugin_client.cc b/libmysql/authentication_win/plugin_client.cc
|
|
index d25aae8..ecfee79 100644
|
|
--- a/libmysql/authentication_win/plugin_client.cc
|
|
+++ b/libmysql/authentication_win/plugin_client.cc
|
|
@@ -26,7 +26,7 @@
|
|
*/
|
|
|
|
#ifdef _MSC_VER
|
|
-#pragma comment(lib, "Secur32")
|
|
+#pragma comment(lib, "secur32")
|
|
#endif
|
|
|
|
static int win_auth_client_plugin_init(char*, size_t, int, va_list)
|
|
--
|
|
2.1.4
|
|
|