summaryrefslogtreecommitdiff
path: root/src/net/messagein.cpp
diff options
context:
space:
mode:
authorDuane Bailey <nayryeliab@gmail.com>2005-09-22 23:28:58 +0000
committerDuane Bailey <nayryeliab@gmail.com>2005-09-22 23:28:58 +0000
commit6e383d8867081d3ec6b57b4d2f171a4382e83195 (patch)
tree3c658e7e8068f7f0a13c8434dd1fac0e47b43ab1 /src/net/messagein.cpp
parent59796855784a34e35d09c5cb3750dd5a9b421c10 (diff)
downloadmana-6e383d8867081d3ec6b57b4d2f171a4382e83195.tar.gz
mana-6e383d8867081d3ec6b57b4d2f171a4382e83195.tar.bz2
mana-6e383d8867081d3ec6b57b4d2f171a4382e83195.tar.xz
mana-6e383d8867081d3ec6b57b4d2f171a4382e83195.zip
removed win2mac support
Diffstat (limited to 'src/net/messagein.cpp')
-rw-r--r--src/net/messagein.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp
index c599a453..e3f8c28e 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.cpp
@@ -25,9 +25,7 @@
#include <cassert>
#include <SDL.h>
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-#include "win2mac.h"
-#endif
+#include <SDL_endian.h>
#define MAKEWORD(low,high) \
((unsigned short)(((unsigned char)(low)) | \
@@ -56,7 +54,7 @@ MessageIn::readShort()
assert(mPos + 2 <= mLength);
mPos += 2;
#if SDL_BYTEORDER == SDL_BIG_ENDIAN
- return DR_SwapTwoBytes(*(short*)(mData + (mPos - 2)));
+ return SDL_Swap16(*(short*)(mData + (mPos - 2)));
#else
return (*(short*)(mData + (mPos - 2)));
#endif
@@ -68,7 +66,7 @@ MessageIn::readLong()
assert(mPos + 4 <= mLength);
mPos += 4;
#if SDL_BYTEORDER == SDL_BIG_ENDIAN
- return DR_SwapFourBytes(*(long*)(mData + (mPos - 4)));
+ return SDL_Swap32(*(long*)(mData + (mPos - 4)));
#else
return (*(long*)(mData + (mPos - 4)));
#endif