Sync with trunk r63786.

svn path=/branches/shell-experiments/; revision=63788
This commit is contained in:
David Quintana 2014-07-31 00:57:14 +00:00
commit 34a27346de
465 changed files with 5941 additions and 4287 deletions

View file

@ -13,6 +13,11 @@ elseif(ARCH STREQUAL "amd64")
if(NOT MSVC)
list(APPEND CHKSTK_SOURCE except/amd64/chkstk_ms.s)
endif()
elseif(ARCH STREQUAL "arm")
list(APPEND CHKSTK_ASM_SOURCE except/arm/chkstk_asm.s)
if(NOT MSVC)
list(APPEND CHKSTK_SOURCE except/arm/chkstk_ms.s)
endif()
elseif(ARCH STREQUAL "powerpc")
list(APPEND CHKSTK_ASM_SOURCE except/powerpc/chkstk_asm.s)
endif()

View file

@ -9,6 +9,7 @@
#define _sxprintf swprintf_s
#define USE_COUNT 0
#define USE_VARARGS 0
#define _UNICODE
#define IS_SECAPI 1
#include "_sxprintf.c"

View file

@ -9,6 +9,7 @@
#define _sxprintf wvsnprintfW
#define USE_COUNT 1
#define USE_VARARGS 1
#define _UNICODE
#define USER32_WSPRINTF
#include "_sxprintf.c"

View file

@ -9,6 +9,7 @@
#define _sxprintf wvsprintfW
#define USE_COUNT 0
#define USE_VARARGS 1
#define _UNICODE
#define USER32_WSPRINTF
#include "_sxprintf.c"

View file

@ -99,4 +99,3 @@ _internal_handle_float(
else _SET_NUMBER_(float);
}
}
#undef _SET_NUMBER_