Merge pull request #6460 from hughbe/libuuid-windows

Fix linking libuuid on Windows

Author: slavapestov

lib/Basic/CMakeLists.txt

@@ -3,6 +3,9 @@
 if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   set(UUID_INCLUDE "")
   set(UUID_LIBRARIES "")
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  set(UUID_INCLUDE "")
+  set(UUID_LIBRARIES "ole32.lib")
 else()
   find_package(UUID REQUIRED)
   set(UUID_INCLUDE "-I${UUID_INCLUDE_DIRS}")

lib/Basic/UUID.cpp

@@ -20,7 +20,8 @@
 // WIN32 doesn't natively support <uuid/uuid.h>. Instead, we use Win32 APIs.
 #if defined(_WIN32)
 #define WIN32_LEAN_AND_MEAN
-#include <rpc.h>
+#define NOMINMAX
+#include <objbase.h>
 #include <string>
 #else
 #include <uuid/uuid.h>
@@ -31,7 +32,7 @@ using namespace swift;
 swift::UUID::UUID(FromRandom_t) {
 #if defined(_WIN32)
   ::UUID uuid;
-  UuidCreate(&uuid);
+  ::CoCreateGuid(&uuid);
 
   memcpy(Value, &uuid, Size);
 #else
@@ -42,7 +43,7 @@ swift::UUID::UUID(FromRandom_t) {
 swift::UUID::UUID(FromTime_t) {
 #if defined(_WIN32)
   ::UUID uuid;
-  UuidCreate(&uuid);
+  ::CoCreateGuid(&uuid);
 
   memcpy(Value, &uuid, Size);
 #else