From 727be94eb5cd8ce7165a5ff64dc0e4b14a9ca2c1 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Tue, 6 Sep 2011 17:46:00 +0000 Subject: [PATCH] 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 --- polymer/eduke32/build/include/editor.h | 4 ++-- polymer/eduke32/build/src/engine.c | 4 ++-- polymer/eduke32/build/src/kplib.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/polymer/eduke32/build/include/editor.h b/polymer/eduke32/build/include/editor.h index da64b2c01..dc94fb6fc 100644 --- a/polymer/eduke32/build/include/editor.h +++ b/polymer/eduke32/build/include/editor.h @@ -130,11 +130,11 @@ extern int32_t m32_swcnt; extern int32_t m32_wallscreenxy[MAXWALLS][2]; extern int16_t m32_wallsprite[MAXWALLS+MAXSPRITES]; 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 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 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 m32_setkeyfilter(int32_t on); diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c index c2446efa8..fbc764154 100644 --- a/polymer/eduke32/build/src/engine.c +++ b/polymer/eduke32/build/src/engine.c @@ -14184,7 +14184,7 @@ void clear2dscreen(void) ////////// editor side view ////////// -inline int32_t scalescreeny(int32_t sy) +int32_t scalescreeny(int32_t sy) { if (m32_sideview) 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 -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); } diff --git a/polymer/eduke32/build/src/kplib.c b/polymer/eduke32/build/src/kplib.c index fc9b44125..784816553 100644 --- a/polymer/eduke32/build/src/kplib.c +++ b/polymer/eduke32/build/src/kplib.c @@ -60,7 +60,7 @@ static uint16_t SSWAPIL(uint16_t a) { return((a>>8)+(a<<8)); } typedef long long __int64; static __inline int32_t _lrotl(int32_t i, int sh) { return((i>>(-sh))|(i<