fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Let's call the function plugin_syscall instead of syscall to avoid conflicts on Linux.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1097 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Mark Olsen 2005-06-15 15:40:10 +00:00
parent 973d26da3e
commit 741126d966
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/plugin.c
View file

@ -31,7 +31,7 @@ int vmMain( int command, int arg0, int arg1, int arg2, int arg3, int arg4, int a
#ifndef Q3_VM #ifndef Q3_VM
int (QDECL *syscall)( int arg, ... ); int (QDECL *plugin_syscall)( int arg, ... );
#endif #endif
#define PASSFLOAT(f) *(int*)&(f) #define PASSFLOAT(f) *(int*)&(f)
@ -193,7 +193,7 @@ void Plug_InitStandardBuiltins(void)
#ifndef Q3_VM #ifndef Q3_VM
void dllEntry(int (QDECL *funcptr)(int,...)) void dllEntry(int (QDECL *funcptr)(int,...))
{ {
syscall = funcptr; plugin_syscall = funcptr;
} }
#endif #endif

6
plugins/plugin.h
View file

@ -22,8 +22,8 @@ typedef char *va_list;
#include <stdarg.h> #include <stdarg.h>
//DLLs need a wrapper to add the extra parameter and call a boring function. //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 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 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 {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 CHECKBUILTIN(n) BUILTIN_##n = (int)Plug_GetEngineFunction(#n);
#define BUILTINISVALID(n) BUILTIN_##n != 0 #define BUILTINISVALID(n) BUILTIN_##n != 0
#ifdef _WIN32 #ifdef _WIN32
@ -31,7 +31,7 @@ typedef char *va_list;
#else #else
#define QDECL #define QDECL
#endif #endif
extern int (*syscall)( int arg, ... ); extern int (*plugin_syscall)( int arg, ... );
#endif #endif