From b2947119cdbf5c2639705e52ce6f83b906be4282 Mon Sep 17 00:00:00 2001 From: Scott Ehlert Date: Wed, 19 Jul 2006 06:57:03 +0000 Subject: [PATCH] Oh, maybe I should replace this too --HG-- extra : convert_revision : svn%3Ac2935e3e-5518-0410-8daf-afa5dab7d4e3/trunk%40222 --- sourcemm/sample_mm/oslink.h | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/sourcemm/sample_mm/oslink.h b/sourcemm/sample_mm/oslink.h index aad6c0e..ab297dc 100644 --- a/sourcemm/sample_mm/oslink.h +++ b/sourcemm/sample_mm/oslink.h @@ -1,5 +1,5 @@ /* ======== SourceMM ======== -* Copyright (C) 2004-2005 Metamod:Source Development Team +* Copyright (C) 2004-2006 Metamod:Source Development Team * No warranties of any kind * * License: zlib/libpng @@ -19,14 +19,22 @@ #if defined __WIN32__ || defined _WIN32 || defined WIN32 #define WIN32_LEAN_AND_MEAN #define OS_WIN32 + #if defined _MSC_VER && _MSC_VER >= 1400 + #undef ARRAYSIZE + #else + #define mkdir _mkdir + #endif #include #include #include - #define mkdir(a) _mkdir(a) #define dlmount(x) LoadLibrary(x) #define dlsym(x, s) GetProcAddress(x, s) #define dlclose(x) FreeLibrary(x) const char* dlerror(); + #define PATH_SEP_STR "\\" + #define PATH_SEP_CHAR '\\' + #define ALT_SEP_CHAR '/' + #define SERVER_DLL "server.dll" #elif defined __linux__ #define OS_LINUX #include @@ -35,6 +43,11 @@ #include #define dlmount(x) dlopen(x,RTLD_NOW) typedef void* HINSTANCE; + #define PATH_SEP_STR "/" + #define PATH_SEP_CHAR '/' + #define ALT_SEP_CHAR '\\' + #define stricmp strcasecmp + #define SERVER_DLL "server_i486.so" #endif #if defined __linux__ @@ -42,6 +55,8 @@ int GetLastError(); #endif +bool GetFileOfAddress(void *pAddr, char *buffer, size_t maxlength); + #if defined __WIN32__ || defined _WIN32 || defined WIN32 #define SMM_API extern "C" __declspec(dllexport) #elif defined __GNUC__ @@ -52,11 +67,12 @@ typedef __int64 int64_t; typedef unsigned __int64 uint64_t; #elif defined __GNUC__ -# if !__GLIBC_HAVE_LONG_LONG +#include +#if !__GLIBC_HAVE_LONG_LONG typedef long long int64_t; -# endif typedef unsigned long long uint64_t; #endif +#endif #ifndef __linux__ #define snprintf _snprintf