Changes for Linux.

This commit is contained in:
LuisAntonRebollo 2015-01-18 21:35:11 +01:00
parent aa35157eef
commit 3336bffad2
30 changed files with 99 additions and 173 deletions

View file

@ -391,9 +391,9 @@ void dPrintf(const char *format, ...)
vprintf(format, args);
}
S32 dVprintf(const char *format, void *arglist)
S32 dVprintf(const char *format, va_list arglist)
{
return vprintf(format, (char*)arglist);
return (S32)vprintf(format, arglist);
}
S32 dSprintf(char *buffer, U32 bufferSize, const char *format, ...)
@ -409,9 +409,9 @@ S32 dSprintf(char *buffer, U32 bufferSize, const char *format, ...)
}
S32 dVsprintf(char *buffer, U32 bufferSize, const char *format, void *arglist)
S32 dVsprintf(char *buffer, U32 bufferSize, const char *format, va_list arglist)
{
S32 len = vsnprintf(buffer, bufferSize, format, (char*)arglist);
S32 len = vsnprintf(buffer, bufferSize, format, arglist);
AssertWarn( len < bufferSize, "Buffer too small in call to dVsprintf!" );

View file

@ -26,6 +26,7 @@
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <cstdarg>
#ifndef _TORQUE_TYPES_H_
#include "platform/types.h"
@ -229,9 +230,9 @@ int dItoa(int n, char s[]);
// standard I/O functions [defined in platformString.cpp]
extern void dPrintf(const char *format, ...);
extern S32 dVprintf(const char *format, void *arglist);
extern S32 dVprintf(const char *format, va_list arglist);
extern S32 dSprintf(char *buffer, U32 bufferSize, const char *format, ...);
extern S32 dVsprintf(char *buffer, U32 bufferSize, const char *format, void *arglist);
extern S32 dVsprintf(char *buffer, U32 bufferSize, const char *format, va_list arglist);
extern S32 dSscanf(const char *buffer, const char *format, ...);
#endif