From 1c985c65d2637e070fae6929641ede415eb66c40 Mon Sep 17 00:00:00 2001 From: Spoike Date: Sat, 13 Jun 2009 12:25:39 +0000 Subject: [PATCH] and a bit more git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3221 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/qclib/qcc.h | 8 ++------ engine/qclib/qcc_pr_comp.c | 2 +- engine/qclib/qccmain.c | 4 ++-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/engine/qclib/qcc.h b/engine/qclib/qcc.h index 6c891e1c3..2012bb657 100644 --- a/engine/qclib/qcc.h +++ b/engine/qclib/qcc.h @@ -24,10 +24,6 @@ #define progfuncs qccprogfuncs extern progfuncs_t *qccprogfuncs; -#if defined(_WIN32) && !defined(MINGW) -#define inline _inline -#endif - #ifndef _WIN32 #define stricmp strcasecmp #define strnicmp strncasecmp @@ -875,7 +871,7 @@ extern qcc_cachedsourcefile_t *qcc_sourcefile; #ifdef COMMONINLINES -bool inline QCC_PR_CheckToken (char *string) +static bool inline QCC_PR_CheckToken (char *string) { if (pr_token_type != tt_punct) return false; @@ -887,7 +883,7 @@ bool inline QCC_PR_CheckToken (char *string) return true; } -void inline QCC_PR_Expect (char *string) +static void inline QCC_PR_Expect (char *string) { if (strcmp (string, pr_token)) QCC_PR_ParseError ("expected %s, found %s",string, pr_token); diff --git a/engine/qclib/qcc_pr_comp.c b/engine/qclib/qcc_pr_comp.c index 5fe786403..517685cdf 100644 --- a/engine/qclib/qcc_pr_comp.c +++ b/engine/qclib/qcc_pr_comp.c @@ -1067,7 +1067,7 @@ Emits a primitive statement, returning the var it places it's value in ============ */ QCC_def_t *QCC_PR_Statement ( QCC_opcode_t *op, QCC_def_t *var_a, QCC_def_t *var_b, QCC_dstatement_t **outstatement); -int inline QCC_ShouldConvert(QCC_def_t *var, etype_t wanted) +static int QCC_ShouldConvert(QCC_def_t *var, etype_t wanted) { if (var->type->type == ev_integer && wanted == ev_function) return 0; diff --git a/engine/qclib/qccmain.c b/engine/qclib/qccmain.c index 5394e9234..1558d4bb1 100644 --- a/engine/qclib/qccmain.c +++ b/engine/qclib/qccmain.c @@ -1709,7 +1709,7 @@ char *Sva(char *msg, ...) #define PROGDEFS_MAX_SIZE 16384 //write (to file buf) and add to the crc -void inline Add(char *p, unsigned short *crc, char *file) +static void Add(char *p, unsigned short *crc, char *file) { char *s; int i = strlen(file); @@ -1725,7 +1725,7 @@ void inline Add(char *p, unsigned short *crc, char *file) #define ADD(p) Add(p, &crc, file) //#define ADD(p) {char *s;int i = strlen(p);for(s=p;*s;s++,i++){QCC_CRC_ProcessByte(&crc, *s);file[i] = *s;}file[i]='\0';} -void inline Add3(char *p, unsigned short *crc, char *file) +static void Add3(char *p, unsigned short *crc, char *file) { char *s; for(s=p;*s;s++)