hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/input/input_buffer.cpp
This commit is contained in:
Thulinma 2015-12-25 15:44:23 +01:00
commit 8eb518606a
5 changed files with 15 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/shared_memory.cpp
View file

@ -653,13 +653,13 @@ namespace IPC {
///\brief Sets checksum field
void statExchange::crc(unsigned int sum) {
htobl(data + 186, sum);
htobl(data + 168, sum);
}
///\brief Gets checksum field
unsigned int statExchange::crc() {
unsigned int result;
btohl(data + 186, result);
btohl(data + 168, result);
return result;
}

2
lib/shared_memory.h
View file

@ -11,7 +11,7 @@
#include <semaphore.h>
#endif
#define STAT_EX_SIZE 172
#define STAT_EX_SIZE 174
#define PLAY_EX_SIZE 2+6*SIMUL_TRACKS
namespace IPC {