diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-06-21 21:50:43 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-06-21 21:50:43 -0400 |
| commit | 327409443fa5631b98e65b0c1cce1cfb6e05f723 (patch) | |
| tree | 1994e8151d071ee1228852544e67f38e14c8b16a /mysys | |
| parent | fc716dc5a5abd6997310256a1f846e39ea5bf312 (diff) | |
| parent | 5a44e1a4024f1760021e5c6fd65773584d60513a (diff) | |
| download | mariadb-git-327409443fa5631b98e65b0c1cce1cfb6e05f723.tar.gz | |
Merge tag 'mariadb-5.5.44' into 5.5-galera
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_gethwaddr.c | 2 | ||||
| -rw-r--r-- | mysys/my_init.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_gethwaddr.c b/mysys/my_gethwaddr.c index 74dae29f235..db026c13700 100644 --- a/mysys/my_gethwaddr.c +++ b/mysys/my_gethwaddr.c @@ -130,7 +130,7 @@ err: #elif defined(_WIN32) #include <winsock2.h> #include <iphlpapi.h> -#pragma comment(lib, "iphlpapi.lib")
+#pragma comment(lib, "iphlpapi.lib") #define ETHER_ADDR_LEN 6 diff --git a/mysys/my_init.c b/mysys/my_init.c index 193c8281577..99efba14a73 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -25,7 +25,7 @@ #ifdef _MSC_VER #include <locale.h> #include <crtdbg.h> -/* WSAStartup needs winsock library*/
+/* WSAStartup needs winsock library*/ #pragma comment(lib, "ws2_32") #endif my_bool have_tcpip=0; |