From 741126d966ea10e1fb340cca86142a61cee2af0a Mon Sep 17 00:00:00 2001 From: Mark Olsen Date: Wed, 15 Jun 2005 15:40:10 +0000 Subject: [PATCH] Let's call the function plugin_syscall instead of syscall to avoid conflicts on Linux. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1097 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- plugins/plugin.c | 4 ++-- plugins/plugin.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/plugin.c b/plugins/plugin.c index 9ea188641..9ba2e1c00 100644 --- a/plugins/plugin.c +++ b/plugins/plugin.c @@ -31,7 +31,7 @@ int vmMain( int command, int arg0, int arg1, int arg2, int arg3, int arg4, int a #ifndef Q3_VM -int (QDECL *syscall)( int arg, ... ); +int (QDECL *plugin_syscall)( int arg, ... ); #endif #define PASSFLOAT(f) *(int*)&(f) @@ -193,7 +193,7 @@ void Plug_InitStandardBuiltins(void) #ifndef Q3_VM void dllEntry(int (QDECL *funcptr)(int,...)) { - syscall = funcptr; + plugin_syscall = funcptr; } #endif diff --git a/plugins/plugin.h b/plugins/plugin.h index 6a5fcda37..7ea79e3b7 100644 --- a/plugins/plugin.h +++ b/plugins/plugin.h @@ -22,8 +22,8 @@ typedef char *va_list; #include //DLLs need a wrapper to add the extra parameter and call a boring function. #define EBUILTIN(t, n, args) extern int BUILTIN_##n; t n args -#define BUILTINR(t, n, args) int BUILTIN_##n; t n args {return (t)syscall(BUILTIN_##n ARGNAMES);} -#define BUILTIN(t, n, args) int BUILTIN_##n; t n args {syscall(BUILTIN_##n ARGNAMES);} +#define BUILTINR(t, n, args) int BUILTIN_##n; t n args {return (t)plugin_syscall(BUILTIN_##n ARGNAMES);} +#define BUILTIN(t, n, args) int BUILTIN_##n; t n args {plugin_syscall(BUILTIN_##n ARGNAMES);} #define CHECKBUILTIN(n) BUILTIN_##n = (int)Plug_GetEngineFunction(#n); #define BUILTINISVALID(n) BUILTIN_##n != 0 #ifdef _WIN32 @@ -31,7 +31,7 @@ typedef char *va_list; #else #define QDECL #endif -extern int (*syscall)( int arg, ... ); +extern int (*plugin_syscall)( int arg, ... ); #endif