Fixes #257
Can compile OK with MSVC once again. Frame.h must be included before default system header #includes, so we don't have linker redefinitions & conflicts with the non C99 compliant routines that MSVC uses. Or in other words, we want our C99 compliant routines to override the default routines that MSVC uses. git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6640 4a71c877-e1ca-e34f-864e-861f7616d084master
parent
1f5ab803ed
commit
ac9a882f07
|
@ -31,6 +31,12 @@
|
|||
#endif
|
||||
|
||||
#include "types.h"
|
||||
/**
|
||||
* NOTE: the next two #include lines are needed by MSVC to override the default,
|
||||
* non C99 compliant routines, and redefinition; different linkage errors
|
||||
*/
|
||||
#include "stdio_ext.h"
|
||||
#include "string_ext.h"
|
||||
|
||||
#include "macros.h"
|
||||
#include "debug.h"
|
||||
|
|
|
@ -17,14 +17,13 @@
|
|||
along with Warzone 2100; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
#include "frame.h"
|
||||
#include "stdio_ext.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <assert.h>
|
||||
|
||||
#include "frame.h"
|
||||
|
||||
|
||||
int vslcatprintf(char* str, size_t size, const char* format, va_list ap)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue