OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-21 12:49:10 +00:00
Code Releases Activity

Merge commit 'bb8fdb9'

Browse Source
This commit is contained in:
Michael Hansen
2011-04-23 21:52:02 -07:00
parent 0a0f317970 62a6757ea6
commit 81d6cf0ec7
3 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -69,6 +69,14 @@ if(PLASMA_TARGETS STREQUAL "Ethereal")
add_definitions(-DSTREAM_LOGGER) add_definitions(-DSTREAM_LOGGER)
endif(PLASMA_TARGETS STREQUAL "Ethereal") endif(PLASMA_TARGETS STREQUAL "Ethereal")
INCLUDE(TestBigEndian)
TEST_BIG_ENDIAN(BIG_ENDIAN)
IF(BIG_ENDIAN)
ADD_DEFINITIONS(-DBIG_ENDIAN)
ELSE()
ADD_DEFINITIONS(-DLITTLE_ENDIAN)
ENDIF()
if(MSVC) if(MSVC)
add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_definitions(-D_CRT_SECURE_NO_WARNINGS)
add_definitions(-D_SCL_SECURE_NO_WARNINGS) add_definitions(-D_SCL_SECURE_NO_WARNINGS)

16
Sources/Plasma/NucleusLib/pnUtils/Private/pnUtEndian.h
View File

@ -40,22 +40,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
// use little-endian as the "native" language of our network messages. // use little-endian as the "native" language of our network messages.
/*****************************************************************************
*
* Types and constants
*
***/
#ifdef _M_IX86
# define LITTLE_ENDIAN 1
#else
# define BIG_ENDIAN 1
// That was a pretty weak check for endian-ness, if it
// failed then we probably need to strengthen it a bit.
# error "Are you sure this is a big-endian CPU?"
#endif
/***************************************************************************** /*****************************************************************************
* *
* Little endian functions * Little endian functions

4
Sources/Plasma/NucleusLib/pnUtils/Private/pnUtUuid.h
View File

@ -80,7 +80,7 @@ bool GuidFromHex (const byte buf[], unsigned length, Uuid * uuid);
* *
***/ ***/
#include <PshPack1.h> #include <pshpack1.h>
struct Uuid { struct Uuid {
union { union {
dword dwords[4]; dword dwords[4];
@ -98,6 +98,6 @@ struct Uuid {
inline bool operator != (const Uuid & rhs) const { return !GuidsAreEqual(*this, rhs); } inline bool operator != (const Uuid & rhs) const { return !GuidsAreEqual(*this, rhs); }
inline bool operator != (int rhs) const { ASSERT(!rhs); return !GuidsAreEqual(*this, kNilGuid); } inline bool operator != (int rhs) const { ASSERT(!rhs); return !GuidsAreEqual(*this, kNilGuid); }
}; };
#include <PopPack.h> #include <poppack.h>