griffkid4/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

linux-compat

Browse Source 
This was SVN commit r91.
This commit is contained in:
Simon Brenner 2003-11-25 02:26:06 +00:00
parent b0f795ff0e
commit 530eecfe16
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/lib/glext_funcs.h
View File

@ -1,6 +1,6 @@
// were these defined as real functions in gl.h already?
#ifndef REAL_GL_1_2_1
#ifndef REAL_GL_1_2
FUNC(void, glMultiTexCoord2f, (int, float, float))
#endif

4
source/lib/ogl.h
View File

@ -37,8 +37,8 @@ typedef unsigned short wchar_t; // for glu.h
// if gl.h provides real prototypes for 1.2 / 1.3 functions,
// exclude the corresponding function pointers in glext_funcs.h
#ifdef GL_VERSION_1_2_1
#define REAL_GL_1_2_1
#ifdef GL_VERSION_1_2
#define REAL_GL_1_2
#endif
#ifdef GL_VERSION_1_3
#define REAL_GL_1_3

2
source/lib/types.h
View File

@ -31,6 +31,8 @@
#define _UINTPTR_T_DEFINED
#define uintptr_t u32
#endif // _UINTPTR_T_DEFINED
#else
#include <stdint.h>
#endif // _MSC_VER

4
source/lib/vfs.cpp
View File

@ -440,7 +440,7 @@ int vfs_finish_read(const u32 slot, void*& p, size_t& size)
s->tag = 0; // free this slot
p = cb->aio_buf;
p = (void *)cb->aio_buf;
size = bytes_read;
return (bytes_read > 0)? 0 : -1;
@ -564,4 +564,4 @@ Handle vfs_load(const char* fn, void*& _p, size_t& _size, bool dont_map)
int vfs_close(Handle h)
{
return h_free(h, H_VFILE);
}
}