Proper fix to my previous failed fix
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3955 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
5c52aa9975
commit
0b7e5ce3e6
2 changed files with 17 additions and 8 deletions
|
@ -10,6 +10,16 @@
|
||||||
extern jmp_buf qcccompileerror;
|
extern jmp_buf qcccompileerror;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef _WIN64
|
||||||
|
#ifdef _SDL
|
||||||
|
#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);
|
||||||
|
void *__imp__vsnprintf = vsnprintf;
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
// set these before calling CheckParm
|
// set these before calling CheckParm
|
||||||
int myargc;
|
int myargc;
|
||||||
char **myargv;
|
char **myargv;
|
||||||
|
|
|
@ -6,14 +6,13 @@
|
||||||
#endif
|
#endif
|
||||||
#include "time.h"
|
#include "time.h"
|
||||||
|
|
||||||
// Win64 + SDL = undfined reference to vsnprintf
|
|
||||||
#ifdef _WIN64
|
#ifdef _WIN64
|
||||||
#ifdef SDL_MAJOR_VERSION
|
#ifdef _SDL
|
||||||
//msvc crap
|
|
||||||
#define snprintf linuxlike_snprintf
|
#define snprintf linuxlike_snprintf
|
||||||
int VARGS linuxlike_snprintf(char *buffer, int size, const char *format, ...) LIKEPRINTF(3);
|
int VARGS linuxlike_snprintf(char *buffer, int size, const char *format, ...) LIKEPRINTF(3);
|
||||||
#define vsnprintf linuxlike_vsnprintf
|
#define vsnprintf linuxlike_vsnprintf
|
||||||
int VARGS linuxlike_vsnprintf(char *buffer, int size, const char *format, va_list argptr);
|
int VARGS linuxlike_vsnprintf(char *buffer, int size, const char *format, va_list argptr);
|
||||||
|
//void *__imp__vsnprintf = vsnprintf;
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue