From dd006b6edd07efa25ab716fc06588d0825c9c902 Mon Sep 17 00:00:00 2001 From: Lance Date: Fri, 23 Dec 2011 02:53:12 +0000 Subject: [PATCH] removed some redundant code required for mingw64 git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3932 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/qclib/qcc_cmdlib.c | 18 ------------------ engine/qclib/qcc_pr_lex.c | 18 ------------------ 2 files changed, 36 deletions(-) diff --git a/engine/qclib/qcc_cmdlib.c b/engine/qclib/qcc_cmdlib.c index f93e3e9c1..fd39a5350 100644 --- a/engine/qclib/qcc_cmdlib.c +++ b/engine/qclib/qcc_cmdlib.c @@ -10,24 +10,6 @@ extern jmp_buf qcccompileerror; #endif -// I put the following here to resolve "undefined reference to `__imp__vsnprintf'" with MinGW64 ~ Moodles -#ifdef __MINGW64__ -#ifndef QCCONLY - #if (_MSC_VER >= 1400) - //with MSVC 8, use MS extensions - #define snprintf linuxlike_snprintf_vc8 - int VARGS linuxlike_snprintf_vc8(char *buffer, int size, const char *format, ...) LIKEPRINTF(3); - #define vsnprintf(a, b, c, d) vsnprintf_s(a, b, _TRUNCATE, c, d) - #else - //msvc crap - #define snprintf linuxlike_snprintf - int VARGS linuxlike_snprintf(char *buffer, int size, const char *format, ...) LIKEPRINTF(3); - #define vsnprintf linuxlike_vsnprintf - int VARGS linuxlike_vsnprintf(char *buffer, int size, const char *format, va_list argptr); - #endif -#endif -#endif - // set these before calling CheckParm int myargc; char **myargv; diff --git a/engine/qclib/qcc_pr_lex.c b/engine/qclib/qcc_pr_lex.c index f8f52d209..ac3c96cb1 100644 --- a/engine/qclib/qcc_pr_lex.c +++ b/engine/qclib/qcc_pr_lex.c @@ -6,24 +6,6 @@ #endif #include "time.h" -// I put the following here to resolve "undefined reference to `__imp__vsnprintf'" with MinGW64 ~ Moodles -#ifdef __MINGW64__ -#ifndef QCCONLY - #if (_MSC_VER >= 1400) - //with MSVC 8, use MS extensions - #define snprintf linuxlike_snprintf_vc8 - int VARGS linuxlike_snprintf_vc8(char *buffer, int size, const char *format, ...) LIKEPRINTF(3); - #define vsnprintf(a, b, c, d) vsnprintf_s(a, b, _TRUNCATE, c, d) - #else - //msvc crap - #define snprintf linuxlike_snprintf - int VARGS linuxlike_snprintf(char *buffer, int size, const char *format, ...) LIKEPRINTF(3); - #define vsnprintf linuxlike_vsnprintf - int VARGS linuxlike_vsnprintf(char *buffer, int size, const char *format, va_list argptr); - #endif -#endif -#endif - #define MEMBERFIELDNAME "__m%s" #define STRCMP(s1,s2) (((*s1)!=(*s2)) || strcmp(s1+1,s2+1)) //saves about 2-6 out of 120 - expansion of idea from fastqcc