From: Chris Porter Date: Mon, 13 Oct 2008 01:37:56 +0000 (+0100) Subject: Remove all inline stuff as gcc on Y doesn't like it :( X-Git-Url: https://jfr.im/git/irc/quakenet/newserv.git/commitdiff_plain/4f556cb0efc86efec2843a195fe76e8004855b40 Remove all inline stuff as gcc on Y doesn't like it :( --- diff --git a/lua/lua.c b/lua/lua.c index 32d460cc..07087df1 100644 --- a/lua/lua.c +++ b/lua/lua.c @@ -438,7 +438,7 @@ int lua_lineok(const char *data) { return 1; } -INLINE int lua_debugpcall(lua_State *l, char *message, int a, int b, int c) { +int lua_debugpcall(lua_State *l, char *message, int a, int b, int c) { lua_list *l2 = lua_listfromstate(l); int ret; diff --git a/lua/lua.h b/lua/lua.h index ceb59793..e9736812 100644 --- a/lua/lua.h +++ b/lua/lua.h @@ -116,22 +116,6 @@ void lua_debugoutput(char *p, ...) __attribute__ ((format (printf, 1, 2))); #endif -#ifndef INLINE - -#ifdef __GNUC__ -#define INLINE __attribute((always_inline)) inline -#endif - -#ifdef _MSC_VER -#define INLINE __forceinline -#endif - -#ifndef INLINE -#define INLINE inline -#endif - -#endif /* INLINE */ - -INLINE int lua_debugpcall(lua_State *l, char *message, int a, int b, int c); +int lua_debugpcall(lua_State *l, char *message, int a, int b, int c); #endif diff --git a/lua/luacommands.c b/lua/luacommands.c index c1a55f9b..ce00d522 100644 --- a/lua/luacommands.c +++ b/lua/luacommands.c @@ -38,8 +38,8 @@ struct lua_pusher nickpusher[MAX_PUSHER]; struct lua_pusher chanpusher[MAX_PUSHER]; int nickpushercount, chanpushercount; -INLINE void lua_setuppusher(struct lua_pusher *pusherlist, lua_State *l, int index, struct lua_pusher **lp, int max, int pcount); -INLINE int lua_usepusher(lua_State *l, struct lua_pusher **lp, void *np); +void lua_setuppusher(struct lua_pusher *pusherlist, lua_State *l, int index, struct lua_pusher **lp, int max, int pcount); +int lua_usepusher(lua_State *l, struct lua_pusher **lp, void *np); void lua_initnickpusher(void); void lua_initchanpusher(void); @@ -973,7 +973,7 @@ void lua_initnickpusher(void) { nickpusher[i].argtype = 0; } -INLINE void lua_setuppusher(struct lua_pusher *pusherlist, lua_State *l, int index, struct lua_pusher **lp, int max, int pcount) { +void lua_setuppusher(struct lua_pusher *pusherlist, lua_State *l, int index, struct lua_pusher **lp, int max, int pcount) { int current = 0; if(max > 0) @@ -1002,7 +1002,7 @@ INLINE void lua_setuppusher(struct lua_pusher *pusherlist, lua_State *l, int ind lp[current] = NULL; } -INLINE int lua_usepusher(lua_State *l, struct lua_pusher **lp, void *np) { +int lua_usepusher(lua_State *l, struct lua_pusher **lp, void *np) { int i = 0; while(*lp) {