Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix "incompatible declarations" found by batched compiling. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2460 4a71c877-e1ca-e34f-864e-861f7616d084
master
Dennis Schridde 2007-09-16 14:05:01 +00:00
parent 9db9ca51ea
commit 6627ecbc6a
9 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/framework/resource_lexer.l
View File

@ -40,9 +40,8 @@
void res_error(const char *pMessage,...);
#ifndef YYLMAX
/* Maximum length for any TEXT_T value */
#define YYLMAX 8192
#endif
/* Store for any string values */
char aText[TEXT_BUFFERS][YYLMAX]; // No longer static ... lets use this area globally

2
lib/framework/strres_lexer.l
View File

@ -44,7 +44,7 @@
void strres_error(const char *pMessage,...);
/* Maximum length for any TEXT_T value */
#define YYLMAX 255
#define YYLMAX 8192
/* Store for any string values */
extern char aText[TEXT_BUFFERS][YYLMAX];

3
lib/sound/openal_track.c
View File

@ -42,6 +42,7 @@
#include "tracklib.h"
#include "audio.h"
#include "cdaudio.h"
#include "oggvorbis.h"
#define ATTENUATION_FACTOR 0.0003f
@ -68,8 +69,6 @@ static ALCcontext* context = 0;
BOOL openal_initialized = FALSE;
BOOL cdAudio_Update( void );
#ifndef WZ_NOSOUND
static void PrintOpenALVersion(void)
{

4
src/configuration.c
View File

@ -49,6 +49,7 @@
#include "radar.h"
// HACK bAllowDebugMode shouldn't be in clparse
#include "clparse.h"
#include "multiint.h"
// ////////////////////////////////////////////////////////////////////////////
@ -58,9 +59,6 @@
#define DEFAULTSCROLL 800
#define DEFAULTMAPNAME "Rush"
extern char sForceName[256];
extern UBYTE sPlayer[128];
extern void registry_clear(void); // from configfile.c

1
src/data.c
View File

@ -75,7 +75,6 @@
// whether a save game is currently being loaded
static BOOL saveFlag = FALSE;
extern char aCurrResDir[255]; // Arse
extern int scr_lineno;

4
src/multiint.c
View File

@ -87,8 +87,8 @@
// ////////////////////////////////////////////////////////////////////////////
// vars
extern char MultiCustomMapsPath[255];
extern char MultiPlayersPath[255];
extern char MultiCustomMapsPath[PATH_MAX];
extern char MultiPlayersPath[PATH_MAX];
extern BOOL bSendingMap;

2
src/multimenu.c
View File

@ -62,7 +62,7 @@
W_SCREEN *psRScreen; // requester stuff.
extern char MultiCustomMapsPath[255];
extern char MultiCustomMapsPath[PATH_MAX];
extern void displayMultiBut(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, UDWORD *pColours);
BOOL MultiMenuUp = FALSE;

2
src/multistat.c
View File

@ -45,7 +45,7 @@
#include "multiint.h"
#include "fpath.h"
extern char MultiPlayersPath[255];
extern char MultiPlayersPath[PATH_MAX];
// ////////////////////////////////////////////////////////////////////////////
// STATS STUFF

3
wscript
View File

@ -33,7 +33,7 @@ def set_options(opt):
def configure(conf):
# Check for C-Compiler, the Lexer/Parser tools and get the checks module for checkEndian
conf.check_tool('compiler_cc flex bison checks')
conf.check_tool('compiler_cc batched_cc flex bison checks')
# Big or little endian?
conf.checkEndian()
@ -79,6 +79,7 @@ def configure(conf):
conf.add_define('YY_STATIC', 1)
conf.add_define('LOCALEDIR', '')
conf.add_define('PACKAGE', 'warzone2100')
conf.env['CCFLAGS'] += ['-pipe', '-combine']
# Split off debug variant before adding variant specific defines
conf.set_env_name('debug', conf.env.deepcopy())