Make pnUtUuid compile on *nix.

Sources/Plasma/NucleusLib/pnUUID/pnUUID.cpp

@@ -57,6 +57,11 @@ plUUID::plUUID( const plUUID & other )
     CopyFrom( &other );
 }
 
+plUUID::plUUID( const Uuid & uuid )
+{
+    memcpy(fData, uuid.data, sizeof(fData));
+}
+
 void plUUID::Read( hsStream * s)
 {
     s->LogSubStreamPushDesc("plUUID");
@@ -73,3 +78,9 @@ const char * plUUID::AsString() const {
     ToStdString(str);
     return str.c_str();
 }
+
+plUUID::operator Uuid () const {
+    Uuid uuid;
+    memcpy(uuid.data, fData, sizeof(uuid.data));
+    return uuid;
+}

Sources/Plasma/NucleusLib/pnUUID/pnUUID.h

@@ -44,9 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "HeadSpin.h"
 #include "hsStlUtils.h"
-#ifdef HS_BUILD_FOR_WIN32
 #include "pnUtils/pnUtUuid.h"
-#endif
 
 class hsStream;
 
@@ -65,9 +63,7 @@ public:
     plUUID();
     plUUID( const char * s );
     plUUID( const plUUID & other );
-#ifdef HS_BUILD_FOR_WIN32
     plUUID( const Uuid & uuid );
-#endif
     void    Clear();
     bool    IsNull() const;
     bool    IsSet() const { return !IsNull(); }
@@ -85,9 +81,7 @@ public:
     bool    operator==( const plUUID & other ) const { return IsEqualTo( &other ); }
     bool    operator!=( const plUUID & other ) const { return !IsEqualTo( &other ); }
     int     operator <( const plUUID & other ) const { return CompareTo( &other ); }
-#ifdef HS_BUILD_FOR_WIN32
     operator Uuid () const;
-#endif
 
     static plUUID Generate();
 };

Sources/Plasma/NucleusLib/pnUUID/pnUUID_Win32.cpp

@@ -47,11 +47,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include <rpc.h>
 
-plUUID::plUUID( const Uuid & uuid )
-{
-    memcpy(fData, uuid.data, sizeof(fData));
-}
-
 void plUUID::Clear()
 {
     UuidCreateNil( (GUID *)this );
@@ -85,12 +80,6 @@ void plUUID::CopyFrom( const plUUID & v ) {
     memcpy(fData, v.fData, sizeof(fData));
 }
 
-plUUID::operator Uuid () const {
-    Uuid uuid;
-    memcpy(uuid.data, fData, sizeof(uuid.data));
-    return uuid;
-}
-
 bool plUUID::FromString( const char * str )
 {
     Clear();

Sources/Plasma/NucleusLib/pnUtils/CMakeLists.txt

@@ -45,6 +45,7 @@ set(pnUtils_SOURCES
     pnUtSpareList.cpp
     pnUtStr.cpp
     pnUtTime.cpp
+    pnUtUuid.cpp
 )
 
 if(WIN32)
@@ -59,13 +60,12 @@ if(WIN32)
 
         pnUtCrypt.cpp
         pnUtTls.cpp
-        pnUtUuid.cpp
     )
 else()
     set(pnUtils_UNIX
         Unix/pnUtUxStr.cpp
         #Unix/pnUtUxSync.cpp
-        #Unix/pnUtUxUuid.cpp
+        Unix/pnUtUxUuid.cpp
     )
 endif()
 

Sources/Plasma/NucleusLib/pnUtils/Pch.h

@@ -50,7 +50,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pnUtCoreLib.h"    // must be first in list
 #include "pnUtPragma.h"
-#include "pnProduct/pnProduct.h"
 
 #include <malloc.h>
 

Sources/Plasma/NucleusLib/pnUtils/Unix/pnUtUxUuid.cpp

@@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 *   
 ***/
 
-#include "../pnUtUUID.h"
+#include "../pnUtUuid.h"
 
 /*****************************************************************************
 *

Sources/Plasma/NucleusLib/pnUtils/pnUtAllIncludes.h

@@ -52,18 +52,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pnUtCoreLib.h"    // must be first in list
 #include "pnUtPragma.h"
 #include "pnUtAddr.h"
-#if HS_BUILD_FOR_WIN32
 #include "pnUtUuid.h"
-#endif
 #include "pnUtMath.h"
 #include "pnUtSort.h"
 #include "pnUtArray.h"
 #include "pnUtList.h"
 #include "pnUtHash.h"
 #include "pnUtPriQ.h"
-#if HS_BUILD_FOR_WIN32
 #include "pnUtSync.h"
-#endif
 #include "pnUtTime.h"
 #if HS_BUILD_FOR_WIN32
 #include "pnUtTls.h"

Sources/Plasma/NucleusLib/pnUtils/pnUtCrypt.cpp

@@ -46,6 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 ***/
 
 #include "pnUtCrypt.h"
+#include "pnUtStr.h"
+#include "pnUtTime.h"
 
 #include <openssl/md5.h>
 #include <openssl/sha.h>
@@ -360,13 +362,13 @@ void CryptHashPasswordChallenge (
     const ShaDigest &   namePassHash,
     ShaDigest *         challengeHash
 ) {
-    #include <pshpack1.h>
+#pragma pack(push, 1)
     struct {
         uint32_t       clientChallenge;
         uint32_t       serverChallenge;
         ShaDigest   namePassHash;
     } buffer;
-    #include <poppack.h>
+#pragma pack(pop)
     buffer.clientChallenge  = clientChallenge;
     buffer.serverChallenge  = serverChallenge;
     buffer.namePassHash     = namePassHash;

Sources/Plasma/NucleusLib/pnUtils/pnUtSync.h

@@ -104,9 +104,9 @@ public:
 
 #ifdef HS_BUILD_FOR_WIN32
 typedef HANDLE EventHandle;
-#else
-# error "CEvent: Not implemented on this platform"
-#endif
+//#else
+//# error "CEvent: Not implemented on this platform"
+//#endif
 
 const unsigned  kEventWaitForever   = (unsigned)-1;
 
@@ -130,5 +130,6 @@ public:
     
     const EventHandle & Handle () const { return m_handle; }
 };
+#endif // HS_BUILD_FOR_WIN32
 
 #endif

Sources/Plasma/NucleusLib/pnUtils/pnUtUuid.cpp

@@ -46,6 +46,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 ***/
 
 #include "pnUtUuid.h"
+#include "pnUtHash.h"
+#include "pnUtStr.h"
 
 
 const Uuid kNilGuid;

Sources/Plasma/NucleusLib/pnUtils/pnUtUuid.h

@@ -95,7 +95,7 @@ bool            GuidFromHex (const uint8_t buf[], unsigned length, Uuid * uuid);
 *
 ***/
 
-#include <pshpack1.h>
+#pragma pack(push, 1)
 struct Uuid {
     union {
         uint32_t   uint32_ts[4];
@@ -113,6 +113,6 @@ struct Uuid {
     inline bool operator != (const Uuid & rhs) const { return !GuidsAreEqual(*this, rhs); }
     inline bool operator != (int rhs)          const { ASSERT(!rhs); return !GuidsAreEqual(*this, kNilGuid); }
 };
-#include <poppack.h>
+#pragma pack(pop)
 
 #endif