|
 |
802823f |
diff -up warmux-11.04/lib/warmux/action/action.cpp.gcc47 warmux-11.04/lib/warmux/action/action.cpp
|
|
|
802823f |
--- warmux-11.04/lib/warmux/action/action.cpp.gcc47 2011-04-28 21:03:14.000000000 +0200
|
|
|
802823f |
+++ warmux-11.04/lib/warmux/action/action.cpp 2012-02-27 11:20:35.571676046 +0100
|
|
|
802823f |
@@ -85,7 +85,7 @@ Action::Action(const char *buffer, Dista
|
|
|
802823f |
{
|
|
|
802823f |
m_creator = _creator;
|
|
|
802823f |
|
|
|
802823f |
- m_header.len = SDLNet_Read32(buffer);
|
|
|
802823f |
+ m_header.len = SDLNet_Read32((void *)buffer);
|
|
|
802823f |
ASSERT(m_header.len >= sizeof(Header));
|
|
|
802823f |
buffer += 4;
|
|
|
802823f |
// All of the following could be skipped for the actions we now,
|
|
|
802823f |
@@ -225,7 +225,7 @@ int Action::PopInt()
|
|
|
802823f |
return 0;
|
|
|
802823f |
}
|
|
|
802823f |
|
|
|
802823f |
- uint32_t tmp = SDLNet_Read32(m_read); m_read += 4;
|
|
|
802823f |
+ uint32_t tmp = SDLNet_Read32((void *)m_read); m_read += 4;
|
|
|
802823f |
|
|
|
802823f |
return *((int32_t*)&tmp);
|
|
|
802823f |
}
|
|
|
802823f |
@@ -247,9 +247,9 @@ Double Action::PopDouble()
|
|
|
802823f |
static const uint len = sizeof(fp::fint_t)/4;
|
|
|
802823f |
for (uint i=0; i
|
|
|
802823f |
# if SDL_BYTEORDER == SDL_LIL_ENDIAN
|
|
|
802823f |
- tmp.u32[i] = SDLNet_Read32(m_read);
|
|
|
802823f |
+ tmp.u32[i] = SDLNet_Read32((void *)m_read);
|
|
|
802823f |
# else
|
|
|
802823f |
- tmp.u32[len-1-i] = SDLNet_Read32(m_read);
|
|
|
802823f |
+ tmp.u32[len-1-i] = SDLNet_Read32((void* )m_read);
|
|
|
802823f |
# endif
|
|
|
802823f |
m_read += 4;
|
|
|
802823f |
}
|
|
|
802823f |
diff -up warmux-11.04/tools/list_games/main.cpp.gcc47 warmux-11.04/tools/list_games/main.cpp
|
|
|
802823f |
--- warmux-11.04/tools/list_games/main.cpp.gcc47 2011-04-28 21:03:12.000000000 +0200
|
|
|
802823f |
+++ warmux-11.04/tools/list_games/main.cpp 2012-02-27 11:31:33.764447500 +0100
|
|
|
802823f |
@@ -1,4 +1,5 @@
|
|
|
802823f |
#include <stdio.h>
|
|
|
802823f |
+#include <unistd.h>
|
|
|
802823f |
#include <WARMUX_types.h>
|
|
|
802823f |
#include <WARMUX_network.h>
|
|
|
802823f |
#include <WARMUX_index_server.h>
|