merge from amd64 branch

39059
ssprintf.cpp/xml.cpp: Fix compilation for gcc 4.4.0 and 64bits (Samuel Serapión)

svn path=/trunk/; revision=39418
This commit is contained in:
Timo Kreuzer 2009-02-05 18:57:59 +00:00
parent bf13eb0000
commit 9e98af0628
2 changed files with 3 additions and 2 deletions

View file

@ -1556,7 +1556,7 @@ ssvprintf ( const char *fmt, va_list args )
flags |= ZEROPAD; flags |= ZEROPAD;
} }
result = number(f, result = number(f,
(unsigned long) va_arg(args, void *), 16, (size_t) va_arg(args, void *), 16,
field_width, precision, flags); field_width, precision, flags);
if (result < 0) if (result < 0)
{ {
@ -1880,7 +1880,7 @@ sswvprintf ( const wchar_t* fmt, va_list args )
flags |= ZEROPAD; flags |= ZEROPAD;
} }
result = wnumber(f, result = wnumber(f,
(unsigned long) va_arg(args, void *), 16, (size_t) va_arg(args, void *), 16,
field_width, precision, flags); field_width, precision, flags);
if (result < 0) if (result < 0)
{ {

View file

@ -39,6 +39,7 @@
#include <ctype.h> #include <ctype.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h>
#include "xml.h" #include "xml.h"
#include "ssprintf.h" #include "ssprintf.h"