fix cmakefile for windows and compiling warnings

Author: idealvin

include/co/thread.h

@@ -24,7 +24,7 @@ inline void mutex_unlock(mutex_t* m)   { LeaveCriticalSection(m); }
 
 typedef CONDITION_VARIABLE cond_t;
 inline void cond_init(cond_t* c)                        { InitializeConditionVariable(c); }
-inline void cond_destroy(cond_t* c)                     {}
+inline void cond_destroy(cond_t*)                     {}
 inline void cond_wait(cond_t* c, mutex_t* m)            { SleepConditionVariableCS(c, m, INFINITE); }
 inline bool cond_wait(cond_t* c, mutex_t* m, uint32 ms) { return SleepConditionVariableCS(c, m, ms) == TRUE; }
 inline void cond_notify(cond_t* c)                      { WakeAllConditionVariable(c); }
@@ -41,7 +41,7 @@ typedef DWORD tls_t;
 inline void tls_init(tls_t* k)        { *k = TlsAlloc(); assert(*k != TLS_OUT_OF_INDEXES); }
 inline void tls_destroy(tls_t k)      { TlsFree(k); }
 inline void* tls_get(tls_t k)         { return TlsGetValue(k); }
-inline void tls_set(tls_t k, void* v) { BOOL r = TlsSetValue(k, v); assert(r); }
+inline void tls_set(tls_t k, void* v) { BOOL r = TlsSetValue(k, v); assert(r); (void)r; }
 
 } // xx
 } // co

src/CMakeLists.txt

@@ -69,7 +69,8 @@ endif()
 
 if(WIN32)
     target_compile_definitions(co PUBLIC WIN32_LEAN_AND_MEAN)
-    if(not MSVC)
+    target_compile_definitions(co PRIVATE _WINSOCK_DEPRECATED_NO_WARNINGS)
+    if(NOT MSVC)
         target_compile_definitions(co PRIVATE _FILE_OFFSET_BITS=64)
         target_link_libraries(co PUBLIC ws2_32)
     endif()

src/fs_win.cc

@@ -1,8 +1,12 @@
 #ifdef _WIN32
 #include "co/fs.h"
 
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
+#ifdef _MSC_VER
 #pragma warning (disable:4800)
+#endif
 #include <Windows.h>
 
 namespace fs {

src/os_win.cc

@@ -3,7 +3,9 @@
 #include "co/os.h"
 #include <signal.h>
 
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
 #include <Windows.h>
 
 namespace os {

src/so/http.cc

@@ -42,7 +42,8 @@ namespace http {
 #ifdef HAS_LIBCURL
 struct curl_ctx {
     curl_ctx()
-        : l(NULL), upload(NULL), upsize(0), s(-1), cs(-1), action(0), ms(0) {
+        : l(NULL), upload(NULL), upsize(0), 
+          s((curl_socket_t)-1), cs((curl_socket_t)-1), action(0), ms(0) {
         multi = curl_multi_init();
         easy = curl_easy_init();
         memset(err, 0, sizeof(err));
@@ -359,7 +360,7 @@ void Client::do_io() {
     }
 }
 
-int multi_socket_cb(CURL* easy, curl_socket_t s, int action, void* userp, void* socketp) {
+int multi_socket_cb(CURL*, curl_socket_t s, int action, void* userp, void*) {
     CHECK(userp != NULL);
     curl_ctx* ctx = (curl_ctx*)userp;
     switch (action) {
@@ -430,7 +431,7 @@ size_t easy_read_cb(char* p, size_t size, size_t nmemb, void* userp) {
     return n;
 }
 
-curl_socket_t easy_opensocket_cb(void* userp, curlsocktype purpose, struct curl_sockaddr* addr) {
+curl_socket_t easy_opensocket_cb(void* userp, curlsocktype, struct curl_sockaddr* addr) {
     curl_ctx* ctx = (curl_ctx*)userp;
     curl_socket_t fd = co::socket(addr->family, addr->socktype, addr->protocol);
     if (fd == (sock_t)-1) {
@@ -447,12 +448,12 @@ curl_socket_t easy_opensocket_cb(void* userp, curlsocktype purpose, struct curl_
     return CURL_SOCKET_BAD;
 }
 
-int easy_closesocket_cb(void* userp, curl_socket_t fd) {
+int easy_closesocket_cb(void*, curl_socket_t fd) {
     if (fd != (curl_socket_t)-1) return co::close(fd);
     return 0;
 }
 
-int easy_sockopt_cb(void* userp, curl_socket_t fd, curlsocktype purpose) {
+int easy_sockopt_cb(void*, curl_socket_t, curlsocktype) {
     return CURL_SOCKOPT_ALREADY_CONNECTED;
 }
 

src/so/rpc.cc

@@ -42,7 +42,7 @@ class Ping : public Service {
 
     virtual const char* name() const { return "ping"; }
 
-    virtual void process(const Json& req, Json& res) {
+    virtual void process(const Json&, Json& res) {
         res.add_member("err", 200);
         res.add_member("errmsg", "pong");
     }

src/time_win.cc

@@ -4,7 +4,9 @@
 #include <time.h>
 #include <winsock2.h>  // for struct timeval
 
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
 #include <Windows.h>
 
 namespace now {

src/unitest.cc

@@ -9,7 +9,9 @@
 #ifdef _MSC_VER
 #pragma warning(disable:4503)
 #endif
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
 #include <Windows.h>
 #endif
 

src/xmake.lua

@@ -15,6 +15,7 @@ target("libco")
 
     if is_plat("windows", "mingw") then
         add_defines("WIN32_LEAN_AND_MEAN")
+        add_defines("_WINSOCK_DEPRECATED_NO_WARNINGS")
         add_files("__/StackWalker.cpp")
         add_files("co/detours/creatwth.cpp")
         add_files("co/detours/detours.cpp")

unitest/fastring.cc

@@ -70,8 +70,8 @@ DEF_test(fastring) {
         s.append(u);
         EXPECT_EQ(s, "xxxx");
 
-        int i = 'x';
-        s.append(i);
+        char c = 'x';
+        s.append(c);
         EXPECT_EQ(s, "xxxxx");
 
         EXPECT_EQ(fastring("x") + 'x', "xx");