File fix-build.patch of Package nogravity
diff --git a/rlx32/include/systools.h b/rlx32/include/systools.h
index 38ece70..d427f1e 100644
--- a/rlx32/include/systools.h
+++ b/rlx32/include/systools.h
@@ -118,8 +118,8 @@ __end_extern_c
void sysStrnCpy(char *dest, const char *src, size_t n);
#ifndef min
-#define min(a,b) ((a)<(b) ? a : b)
-#define max(a,b) ((a)>(b) ? a : b)
+static inline int min(int a, int b) {return(a<b ? a:b);}
+static inline int max(int a, int b) {return(a>b ? a:b);}
#endif
#define randomf(i_max) ((i_max) * (float)rand() / (float)RAND_MAX)
diff --git a/rlx32/src/syszlib.c b/rlx32/src/syszlib.c
index 199ccc8..8febb68 100644
--- a/rlx32/src/syszlib.c
+++ b/rlx32/src/syszlib.c
@@ -743,7 +743,7 @@ static int CALLING_C fzip_fclose(SYS_FILEHANDLE fp)
SYS_WAD *resource = filewad_getcurrent();
if ((!resource)||((resource->mode & SYS_WAD_STATUS_ENABLED)==0))
{
- return lib_gzclose((gzFile *)fp);
+ return lib_gzclose((gzFile)fp);
}
else
{
@@ -751,7 +751,7 @@ static int CALLING_C fzip_fclose(SYS_FILEHANDLE fp)
SYS_ASSERT(s);
filewad_closeFP(resource, s->file);
s->file = 0;
- lib_gzclose((gzFile *)fp);
+ lib_gzclose((gzFile)fp);
}
return 1;
}
diff --git a/src/lt_func.h b/src/lt_func.h
index 228741b..6e7e770 100644
--- a/src/lt_func.h
+++ b/src/lt_func.h
@@ -125,7 +125,7 @@ void NG_StretchFont(GXSPRITEGROUP *pSpriteGroup, int fx, int fy);
void NG_GamePlay(void);
void NG_DrawVideoSubtitles(FLI_STRUCT *);
void NG_ReadLanguagePack(void);
-void NG_SetLanguage();
+void NG_SetLanguage(int);
int NG_ExecMainMenu(char **menu, int def, u_int32_t defColor, u_int8_t spacing);
// AI