--- uuid.hpp	Mon Aug 23 10:07:24 2010
+++ /e/Libs/zeromq-2.0.7/old_src/uuid.hpp	Mon Aug 23 10:13:48 2010
@@ -77,18 +77,11 @@
         void create_blob ();
 
 #if defined ZMQ_HAVE_WINDOWS
-        ::UUID uuid;
-#ifdef UNICODE
-#ifdef ZMQ_HAVE_MINGW32
-        typedef unsigned short* RPC_WSTR;
-#endif
-        RPC_WSTR string_buf;
-#else //MBCS
 #ifdef ZMQ_HAVE_MINGW32
         typedef unsigned char* RPC_CSTR;
 #endif
+        ::UUID uuid;
         RPC_CSTR string_buf;
-#endif //UNICODE
 #elif defined ZMQ_HAVE_FREEBSD || defined ZMQ_HAVE_NETBSD
         ::uuid_t uuid;
         char *string_buf;