diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-08-23 22:45:30 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-08-23 22:45:30 +0000 |
| commit | c13e838e2aa62268869ffba395ae1388c87806b9 (patch) | |
| tree | c1f6ca4502d0d929e256881bb5f9444b567184f8 /code | |
| parent | a9a4e0e42e6e9baab09017bd107fca82262c31da (diff) | |
| download | ioquake3-aero-c13e838e2aa62268869ffba395ae1388c87806b9.tar.gz ioquake3-aero-c13e838e2aa62268869ffba395ae1388c87806b9.zip | |
* Fix unused variable warning
* Add USE_LOCAL_HEADERS guards to sys_loadlib.h
git-svn-id: svn://svn.icculus.org/quake3/trunk@1458 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code')
| -rw-r--r-- | code/qcommon/vm_interpreted.c | 2 | ||||
| -rw-r--r-- | code/sys/sys_loadlib.h | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/code/qcommon/vm_interpreted.c b/code/qcommon/vm_interpreted.c index 7183e24..6b303d8 100644 --- a/code/qcommon/vm_interpreted.c +++ b/code/qcommon/vm_interpreted.c @@ -480,7 +480,7 @@ nextInstruction2: case OP_BLOCK_COPY: { int *src, *dest; - int i, count, srci, desti; + int count, srci, desti; count = r2; // MrE: copy range check diff --git a/code/sys/sys_loadlib.h b/code/sys/sys_loadlib.h index a7e854c..994c5d3 100644 --- a/code/sys/sys_loadlib.h +++ b/code/sys/sys_loadlib.h @@ -33,10 +33,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # define Sys_UnloadLibrary(h) dlclose(h) # define Sys_LoadFunction(h,fn) dlsym(h,fn) # define Sys_LibraryError() dlerror() -#endif +# endif #else -# include "SDL.h" -# include "SDL_loadso.h" +# ifdef USE_LOCAL_HEADERS +# include "SDL.h" +# include "SDL_loadso.h" +# else +# include <SDL.h> +# include <SDL_loadso.h> +# endif # define Sys_LoadLibrary(f) SDL_LoadObject(f) # define Sys_UnloadLibrary(h) SDL_UnloadObject(h) # define Sys_LoadFunction(h,fn) SDL_LoadFunction(h,fn) |