X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcommon%2Fuuid.cpp;h=c0e512ff11e88c86c7bd50541f6263f5b0976406;hb=e0521275eee34ef6feb06612512c611bb3c3b518;hp=a6588297cace5acc40f3a55305cddade68ee374b;hpb=83f620ca2393f02d875f558455f4270fa1a64ccb;p=xestiaab%2F.git

diff --git a/source/common/uuid.cpp b/source/common/uuid.cpp
index a658829..c0e512f 100644
--- a/source/common/uuid.cpp
+++ b/source/common/uuid.cpp
@@ -4,6 +4,7 @@ wxString GenerateUUID()
 {
 
 #if defined(__WIN32__)
+#include <rpc.h>
     UUID UUIDData;
     UuidCreate(&UUIDData);
     wchar_t* UUIDStr = 0;
@@ -11,10 +12,6 @@ wxString GenerateUUID()
     wxString Result(UUIDStr);
 #elif defined(__HAIKU__)
     
-#elif defined(__APPLE__)
-    
-    wxString Result;
-    
 #else
     
 #include <stdio.h>
@@ -40,18 +37,8 @@ wxString GenerateUUID()
     
     pclose(uuid_hdl);
     
-/*#include <uuid/uuid.h>
-    
-    uuid_t *uuid;
-    uuid_create(&uuid);
-    char *strdata[100];
-    
-    strdata = NULL;
-    
-    wxString Result = wxString::FromUTF8(strdata);
-    
-    delete strdata;
-    strdata = NULL;*/
+    Result = wxString::Format(wxT("%s"), uuidout);
+    Result.Trim();
     
 #endif
     
@@ -66,4 +53,4 @@ bool CheckUUID(wxString UUIDInc)
     
     return Result;
     
-}
\ No newline at end of file
+}