From f895426c1885729f4a4a20b1eb543a92915aed85 Mon Sep 17 00:00:00 2001
From: unknown <sustrik@.(none)>
Date: Mon, 7 Sep 2009 15:41:43 +0200
Subject: initial changes for win port

---
 src/uuid.hpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/uuid.hpp')

diff --git a/src/uuid.hpp b/src/uuid.hpp
index 79a9620..81e41a3 100644
--- a/src/uuid.hpp
+++ b/src/uuid.hpp
@@ -21,15 +21,12 @@
 #define __ZMQ_UUID_HPP_INCLUDED__
 
 #include "platform.hpp"
+#include "stdint.hpp"
 
-#if defined ZMQ_HAVE_WINDOWS
-#include <rpcdce.h>
-#elif defined ZMQ_HAVE_FREEBSD
+#if defined ZMQ_HAVE_FREEBSD
 #include <uuid.h>
 #elif defined ZMQ_HAVE_LINUX || defined ZMQ_HAVE_SOLARIS || defined ZMQ_HAVE_OSX
 #include <uuid/uuid.h>
-#else
-#include <stdint.h>
 #endif
 
 namespace zmq
@@ -56,8 +53,8 @@ namespace zmq
         enum { uuid_string_len = 36 };
 
 #if defined ZMQ_HAVE_WINDOWS
-        ::UUID uuid;
-        char *uuid_str;
+		::UUID uuid;
+        RPC_CSTR uuid_str;
 #elif defined ZMQ_HAVE_FREEBSD
         ::uuid_t uuid;
         char *uuid_str;
-- 
cgit v1.2.3