From 942690dac6de244f39df4ed4f9839d41ad643438 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Mon, 23 May 2016 04:46:34 +0000 Subject: [PATCH] KenBuild: Fix symbol issues. git-svn-id: https://svn.eduke32.com/eduke32@5739 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/testgame/src/config.c | 6 +++--- polymer/eduke32/source/testgame/src/game.c | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/polymer/eduke32/source/testgame/src/config.c b/polymer/eduke32/source/testgame/src/config.c index 900e47521..1df08845f 100644 --- a/polymer/eduke32/source/testgame/src/config.c +++ b/polymer/eduke32/source/testgame/src/config.c @@ -58,7 +58,7 @@ extern short brightness; extern int fullscreen; extern unsigned char option[8]; extern unsigned char keys[NUMBUILDKEYS]; -extern double msens; +double msens; /* * SETUP.DAT @@ -98,7 +98,7 @@ extern double msens; * 18 = Chat (0xf) */ -int loadsetup(const char *fn) +int Ken_loadsetup(const char *fn) { BFILE *fp; #define VL 32 @@ -160,7 +160,7 @@ int loadsetup(const char *fn) return 0; } -int writesetup(const char *fn) +int Ken_writesetup(const char *fn) { BFILE *fp; diff --git a/polymer/eduke32/source/testgame/src/game.c b/polymer/eduke32/source/testgame/src/game.c index 3af4784bd..81805aef9 100644 --- a/polymer/eduke32/source/testgame/src/game.c +++ b/polymer/eduke32/source/testgame/src/game.c @@ -55,8 +55,8 @@ void musicoff(void); void refreshaudio(void); // declared in config.c -int loadsetup(const char *); -int writesetup(const char *); +int Ken_loadsetup(const char *); +int Ken_writesetup(const char *); /*************************************************************************** KEN'S TAG DEFINITIONS: (Please define your own tags for your games) @@ -508,7 +508,7 @@ int32_t app_main(int32_t argc, char const * const * argv) } } - if ((i = loadsetup(setupfilename)) < 0) + if ((i = Ken_loadsetup(setupfilename)) < 0) buildputs("Configuration file not found, using defaults.\n"); #if defined STARTUP_SETUP_WINDOW @@ -517,7 +517,7 @@ int32_t app_main(int32_t argc, char const * const * argv) if (quitevent || !startwin_run()) return -1; } #endif - writesetup(setupfilename); + Ken_writesetup(setupfilename); initgroupfile(G_GrpFile()); if (initengine()) @@ -5035,7 +5035,7 @@ void initlava(void) modify exact [eax edx] int addlava(int); #elif defined(_MSC_VER) && !defined(NOASM) -inline int addlava(void *b) +int addlava(void *b) { _asm { @@ -5051,7 +5051,7 @@ inline int addlava(void *b) } } #elif defined(__GNUC__) && defined(__i386__) && !defined(NOASM) -inline int addlava(void *b) +int addlava(void *b) { int r; __asm__ __volatile__( @@ -5069,7 +5069,7 @@ inline int addlava(void *b) return r; } #else -inline int addlava(void *bx) +int addlava(void *bx) { char *b = (char *)bx; return b[-133] + b[-132] + b[-131] + b[1] + b[-1] + b[131] + b[132];