X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=qdefs.h;h=9371f06eecc703be1efc0afb15305e2ffcf729f8;hp=5eed8b6f69a633cd33691ea23a5a2caca972ac46;hb=4c6cb7882855468365644ac65b6eb86a3e82a812;hpb=b99206803156d4bdfe4ce0c83a2db8f9486e09d4 diff --git a/qdefs.h b/qdefs.h index 5eed8b6f..9371f06e 100644 --- a/qdefs.h +++ b/qdefs.h @@ -9,24 +9,18 @@ #define DP_FUNC_PRINTF(n) __attribute__ ((format (printf, n, n+1))) #define DP_FUNC_PURE __attribute__ ((pure)) #define DP_FUNC_NORETURN __attribute__ ((noreturn)) -#define DP_FUNC_ALWAYSINLINE inline __attribute__((always_inline)) +#define DP_FUNC_ALWAYS_INLINE inline __attribute__((always_inline)) #else #define DP_FUNC_PRINTF(n) #define DP_FUNC_PURE #define DP_FUNC_NORETURN # if defined (_MSC_VER) -# define DP_FUNC_ALWAYSINLINE __forceinline +# define DP_FUNC_ALWAYS_INLINE __forceinline # else # define DP_FUNC_ALWAYS_INLINE inline # endif #endif -#ifdef DP_GCC_COMPATIBLE -#define Q_typeof(var) typeof(var) -#elif defined (_MSC_VER) -#define Q_typeof(var) decltype(var) -#endif - #define MAX_NUM_ARGVS 50 #ifdef DP_SMALLMEMORY