Fixed compiling on the Unix platform
diff --git a/src/engine/framework/tiger_hash.cpp b/src/engine/framework/tiger_hash.cpp
index 510efdf..1d7586c 100644
--- a/src/engine/framework/tiger_hash.cpp
+++ b/src/engine/framework/tiger_hash.cpp
@@ -26,7 +26,7 @@
#define _ULL(x) x##ull
-uint64 table[4 * 256] =
+uint64_t table[4 * 256] =
{
_ULL( 0x02AAB17CF7E90C5E ) /* 0 */, _ULL( 0xAC424B03E243A8EC ) /* 1 */,
_ULL( 0x72CD5BE30DD5FCD3 ) /* 2 */, _ULL( 0x6D019B93F6F97F3A ) /* 3 */,
diff --git a/src/engine/framework/types.h b/src/engine/framework/types.h
index 951a938..c186928 100644
--- a/src/engine/framework/types.h
+++ b/src/engine/framework/types.h
@@ -48,8 +48,8 @@ typedef unsigned long uint32; ///< Compiler independent Unsigned 64-bit
typedef signed __int64 sint64;
typedef unsigned __int64 uint64;
#else
-typedef signed long long sin64;
-typedef unsigned long long uin64;
+typedef signed long long sint64;
+typedef unsigned long long uint64;
#endif
typedef float float32; ///< Compiler independent 32-bit float
diff --git a/src/engine/null/null_autoprecompiled.h b/src/engine/null/null_autoprecompiled.h
index 5f001dd..0e23a8a 100644
--- a/src/engine/null/null_autoprecompiled.h
+++ b/src/engine/null/null_autoprecompiled.h
@@ -70,7 +70,6 @@
#include <platform/windows/resource.h>
#pragma fenv_access (on)
#else
-#include <sys/types.h>
#include <dirent.h>
#include <libgen.h>
#include <fenv.h>
@@ -97,7 +96,6 @@
#include <sys/socket.h>
#include <net/if.h>
#include <sys/ioctl.h>
-#include <sys/types.h>
#include <sys/time.h>
#include <unistd.h>
#include <ifaddrs.h>
diff --git a/src/engine/server/serverClient.cpp b/src/engine/server/serverClient.cpp
index fea40ab..872e8bb 100644
--- a/src/engine/server/serverClient.cpp
+++ b/src/engine/server/serverClient.cpp
@@ -430,11 +430,6 @@ void idServerClientSystemLocal::DirectConnect( netadr_t from )
Info_SetValueForKey( userinfo, "ip", ip );
-#ifndef UPDATE_SERVER
- Info_SetValueForKey( cl->userinfo, "authenticated", va( "%i", cl->authenticated ) );
- Info_SetValueForKey( cl->userinfo, "cl_guid", cl->guid );
-#endif
-
// see if the challenge is valid (local clients don't need to challenge)
if( !networkSystem->IsLocalAddress( from ) )
{
diff --git a/src/tools/communityserver/mySQLDatabase.cpp b/src/tools/communityserver/mySQLDatabase.cpp
index 79fb267..25dc69e 100644
--- a/src/tools/communityserver/mySQLDatabase.cpp
+++ b/src/tools/communityserver/mySQLDatabase.cpp
@@ -39,7 +39,7 @@ MYSQL* connect_database( char* server, char* user, char* password, char* databas
mysql_init( &g_mysql );
- my_bool reconnect = 1;
+ bool reconnect = 1;
mysql_options( &g_mysql, MYSQL_OPT_RECONNECT, &reconnect );
GitHub
sha: eea41a04