From 59411b08ccac01fb1d1038605ff59d87dac80d7a Mon Sep 17 00:00:00 2001 From: asmodai Date: Sun, 10 Jan 2016 19:35:34 +0300 Subject: [PATCH] Using undecorated function name macros for linux --- rehlds/common/mathlib.h | 2 +- rehlds/engine/net.h | 6 +++--- rehlds/public/rehlds/osconfig.h | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/rehlds/common/mathlib.h b/rehlds/common/mathlib.h index 9a84e92..a545a40 100644 --- a/rehlds/common/mathlib.h +++ b/rehlds/common/mathlib.h @@ -20,7 +20,7 @@ typedef float vec_t; /* <42b91> ../common/mathlib.h:6 */ -#ifndef DID_VEC3_T_DEFINE +#if !defined DID_VEC3_T_DEFINE && !defined vec3_t #define DID_VEC3_T_DEFINE typedef vec_t vec3_t[3]; #endif diff --git a/rehlds/engine/net.h b/rehlds/engine/net.h index 5fc041b..0eada85 100644 --- a/rehlds/engine/net.h +++ b/rehlds/engine/net.h @@ -99,9 +99,9 @@ #define MAX_UDP_PACKET 4010 // 9 bytes SPLITHEADER + 4000 payload? // Max length of a reliable message -#define MAX_MSGLEN 3990 // 10 reserved for fragheader? - -// Max length of unreliable message +#define MAX_MSGLEN 3990 // 10 reserved for fragheader? + +// Max length of unreliable message #define MAX_DATAGRAM 4000 // This is the packet payload without any header bytes (which are attached for actual sending) diff --git a/rehlds/public/rehlds/osconfig.h b/rehlds/public/rehlds/osconfig.h index b916ae6..a8ae39c 100644 --- a/rehlds/public/rehlds/osconfig.h +++ b/rehlds/public/rehlds/osconfig.h @@ -123,6 +123,11 @@ VirtualFree(ptr, 0, MEM_RELEASE); } #else // _WIN32 + #ifdef __FUNCTION__ + #undef __FUNCTION__ + #endif + #define __FUNCTION__ __func__ + #ifndef PAGESIZE #define PAGESIZE 4096 #endif