1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54
|
Author: Reiner Herrmann <reiner@reiner-h.de>
Description: Fix FTBFS with GCC 10
Bug-Debian: https://bugs.debian.org/957234
Forwarded: https://github.com/freegish/freegish/pull/4
--- a/src/sdl/file.c
+++ b/src/sdl/file.c
@@ -34,6 +34,9 @@
#include "../sdl/file.h"
+size_t (*fread2)(void *,size_t,size_t,FILE *);
+size_t (*fwrite2)(const void *,size_t,size_t,FILE *);
+
int comparestrings(const void *arg1,const void *arg2)
{
return(strcmp(arg1,arg2));
--- a/src/sdl/file.h
+++ b/src/sdl/file.h
@@ -26,8 +26,8 @@
int comparestrings(const void *arg1,const void *arg2);
int checkfilespec(char *filespec,char *filename);
void listfiles(char *path,char *filespec,char filelist[1024][32],int directories);
-size_t (*fread2)(void *,size_t,size_t,FILE *);
-size_t (*fwrite2)(const void *,size_t,size_t,FILE *);
+extern size_t (*fread2)(void *,size_t,size_t,FILE *);
+extern size_t (*fwrite2)(const void *,size_t,size_t,FILE *);
size_t freadswap(void *ptr,size_t psize,size_t pnum,FILE *pfp);
size_t fwriteswap(const void *ptr,size_t psize,size_t pnum,FILE *pfp);
--- a/src/game/prerender.c
+++ b/src/game/prerender.c
@@ -32,6 +32,9 @@
#include "../physics/bond.h"
#include "../physics/particle.h"
+int numofobjectrenders;
+_objectrender objectrender[512];
+
void setuprenderobjects(void)
{
int count,count2;
--- a/src/game/prerender.h
+++ b/src/game/prerender.h
@@ -45,7 +45,7 @@
float alpha;
} _objectrender;
-int numofobjectrenders;
-_objectrender objectrender[512];
+extern int numofobjectrenders;
+extern _objectrender objectrender[512];
#endif /* GISH_GAME_PRERENDER_H */
|