mirror of
https://github.com/ZDoom/raze-gles.git
synced 2025-01-11 18:50:46 +00:00
Tweak the source so that it can be built by clang. The only necessary change
is to remove a couple of 'inline's for functions with external linkage, which seems to be a GCC convenience. git-svn-id: https://svn.eduke32.com/eduke32@2008 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
08f5290f4f
commit
727be94eb5
3 changed files with 5 additions and 5 deletions
|
@ -130,11 +130,11 @@ extern int32_t m32_swcnt;
|
||||||
extern int32_t m32_wallscreenxy[MAXWALLS][2];
|
extern int32_t m32_wallscreenxy[MAXWALLS][2];
|
||||||
extern int16_t m32_wallsprite[MAXWALLS+MAXSPRITES];
|
extern int16_t m32_wallsprite[MAXWALLS+MAXSPRITES];
|
||||||
extern int8_t sideview_reversehrot;
|
extern int8_t sideview_reversehrot;
|
||||||
extern inline int32_t scalescreeny(int32_t sy);
|
extern int32_t scalescreeny(int32_t sy);
|
||||||
extern void screencoords(int32_t *xres, int32_t *yres, int32_t x, int32_t y, int32_t zoome) ATTRIBUTE((nonnull));
|
extern void screencoords(int32_t *xres, int32_t *yres, int32_t x, int32_t y, int32_t zoome) ATTRIBUTE((nonnull));
|
||||||
//extern void invscreencoords(int32_t *dx, int32_t *dy, int32_t sx, int32_t sy, int32_t zoome);
|
//extern void invscreencoords(int32_t *dx, int32_t *dy, int32_t sx, int32_t sy, int32_t zoome);
|
||||||
extern int32_t getinvdisplacement(int32_t *dx, int32_t *dy, int32_t dz) ATTRIBUTE((nonnull));
|
extern int32_t getinvdisplacement(int32_t *dx, int32_t *dy, int32_t dz) ATTRIBUTE((nonnull));
|
||||||
extern inline int32_t getscreenvdisp(int32_t bz, int32_t zoome);
|
extern int32_t getscreenvdisp(int32_t bz, int32_t zoome);
|
||||||
extern void setup_sideview_sincos(void);
|
extern void setup_sideview_sincos(void);
|
||||||
extern void m32_setkeyfilter(int32_t on);
|
extern void m32_setkeyfilter(int32_t on);
|
||||||
|
|
||||||
|
|
|
@ -14184,7 +14184,7 @@ void clear2dscreen(void)
|
||||||
|
|
||||||
////////// editor side view //////////
|
////////// editor side view //////////
|
||||||
|
|
||||||
inline int32_t scalescreeny(int32_t sy)
|
int32_t scalescreeny(int32_t sy)
|
||||||
{
|
{
|
||||||
if (m32_sideview)
|
if (m32_sideview)
|
||||||
return mulscale14(sy, m32_sidesin);
|
return mulscale14(sy, m32_sidesin);
|
||||||
|
@ -14227,7 +14227,7 @@ int32_t getinvdisplacement(int32_t *dx, int32_t *dy, int32_t dz)
|
||||||
}
|
}
|
||||||
|
|
||||||
// return vertical screen coordinate displacement for BUILD z coord
|
// return vertical screen coordinate displacement for BUILD z coord
|
||||||
inline int32_t getscreenvdisp(int32_t bz, int32_t zoome)
|
int32_t getscreenvdisp(int32_t bz, int32_t zoome)
|
||||||
{
|
{
|
||||||
return mulscale32(bz,zoome*m32_sidecos);
|
return mulscale32(bz,zoome*m32_sidecos);
|
||||||
}
|
}
|
||||||
|
|
|
@ -60,7 +60,7 @@ static uint16_t SSWAPIL(uint16_t a) { return((a>>8)+(a<<8)); }
|
||||||
typedef long long __int64;
|
typedef long long __int64;
|
||||||
static __inline int32_t _lrotl(int32_t i, int sh)
|
static __inline int32_t _lrotl(int32_t i, int sh)
|
||||||
{ return((i>>(-sh))|(i<<sh)); }
|
{ return((i>>(-sh))|(i<<sh)); }
|
||||||
__inline int32_t filelength(int h)
|
/*__inline*/ int32_t filelength(int h)
|
||||||
{
|
{
|
||||||
struct stat st;
|
struct stat st;
|
||||||
if (fstat(h,&st) < 0) return(-1);
|
if (fstat(h,&st) < 0) return(-1);
|
||||||
|
|
Loading…
Reference in a new issue