Fix build and test errors on Ubuntu in windows 10

chen3feng · Jan 15, 2017 · d7d42b0 · d7d42b0
1 parent 4f74915
commit d7d42b0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/base/string/format/print_test.cpp b/base/string/format/print_test.cpp
@@ -51,7 +51,7 @@ TEST(StringPrint, Signed)
     short s = 9527;
     int i = 95279527;
     long l = 95279527L;
-    long ll = 9527952795279527LL;
+    long long ll = 9527952795279527LL;
 
     EXPECT_EQ("42", StringPrint("%i", sc));
 
@@ -74,7 +74,7 @@ TEST(StringPrint, Unsigned)
     unsigned short us = 9527;
     unsigned int ui = 95279527U;
     unsigned long ul = 95279527UL;
-    unsigned long ull = 9527952795279527ULL;
+    unsigned long long ull = 9527952795279527ULL;
 
     EXPECT_EQ("142", StringPrint("%d", uc));
     EXPECT_EQ("142", StringPrint("%i", uc));

diff --git a/crypto/hash/md5.cpp b/crypto/hash/md5.cpp
@@ -222,8 +222,8 @@ void MD5::FinalInternal() {
     byteReverse(context_.in, 14);
 
     /* Append length in bits and transform */
-    ((uint32_t *) context_.in)[14] = context_.bits[0];
-    ((uint32_t *) context_.in)[15] = context_.bits[1];
+    memcpy(context_.in + 14 * 4, &context_.bits[0], 4);
+    memcpy(context_.in + 15 * 4, &context_.bits[1], 4);
 
     MD5Transform(context_.buf, (uint32_t *) context_.in);
     byteReverse((unsigned char *) context_.buf, 4);

diff --git a/system/net/socket.cpp b/system/net/socket.cpp
@@ -281,7 +281,9 @@ bool DataSocket::Connect(const SocketAddress& address, int64_t timeout_ms)
         case EWOULDBLOCK: // For winsock
         case EINPROGRESS:
             {
-                timeval tv = { timeout_ms / 1000, timeout_ms % 1000 * 1000 };
+                timeval tv = {
+                    static_cast<time_t>(timeout_ms / 1000),
+                    static_cast<suseconds_t>(timeout_ms % 1000 * 1000) };
                 if (WaitWriteable(&tv))
                 {
                     // WaitWriteable success doesn't means connect success.

diff --git a/system/threading/rwlock.h b/system/threading/rwlock.h
@@ -9,6 +9,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <pthread.h>
+#include <string.h>
 
 #include "toft/base/uncopyable.h"
 #include "toft/system/check_error.h"
@@ -108,7 +109,7 @@ class RwLock
 #ifdef __GLIBC__
         // If your program crashed here at runtime, maybe the rwlock object
         // has been destructed.
-        if (m_lock.__data.__flags == 0xFFFFFFFFU)
+        if (memcmp(&m_lock.__data.__flags,  "\xFF\xFF\xFF\xFF", 4) == 0)
             TOFT_CHECK_ERRNO_ERROR(EINVAL);
 #endif
     }

diff --git a/system/threading/thread_pool.cpp b/system/threading/thread_pool.cpp
@@ -95,8 +95,8 @@ void ThreadPool::AddTaskInternal(
         }
 
         context.pending_tasks.push_back(task);
+        context.cond.Signal();
     }
-    context.cond.Signal();
 }
 
 void ThreadPool::AddTask(Closure<void()>* callback) {