diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2012-02-24 18:35:17 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2012-02-24 18:54:37 +0100 |
| commit | 6cd8586f2332f2d8a87221452719c33ee0bb9d06 (patch) | |
| tree | f4e186b1a6f80e627aeb8a9ad7226a5a4e25e05b /sal | |
| parent | f61d4545b5fdced396153fac405be75a697a640c (diff) | |
MinGW: snprintf might be present.
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/inc/systools/win32/snprintf.h | 3 | ||||
| -rw-r--r-- | sal/systools/win32/uwinapi/sntprintf.c | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/sal/inc/systools/win32/snprintf.h b/sal/inc/systools/win32/snprintf.h index cfed10fcaee2..fe4f5defe430 100644 --- a/sal/inc/systools/win32/snprintf.h +++ b/sal/inc/systools/win32/snprintf.h @@ -49,6 +49,7 @@ extern "C" { enough to hold the string. */ +#if !defined(__MINGW32__) || defined (__NO_ISOCEXT) /* UNICODE version */ _SNPRINTF_DLLIMPORT int __cdecl snwprintf( wchar_t *buffer, size_t count, const wchar_t *format, ... ); @@ -56,6 +57,8 @@ _SNPRINTF_DLLIMPORT int __cdecl snwprintf( wchar_t *buffer, size_t count, const /* SBCS and MBCS version */ _SNPRINTF_DLLIMPORT int __cdecl snprintf( char *buffer, size_t count, const char *format, ... ); +#endif + /* Conflict with STL_port inline implementation */ #ifdef __cplusplus diff --git a/sal/systools/win32/uwinapi/sntprintf.c b/sal/systools/win32/uwinapi/sntprintf.c index 424e5bd3a3a3..c519da3a0be6 100644 --- a/sal/systools/win32/uwinapi/sntprintf.c +++ b/sal/systools/win32/uwinapi/sntprintf.c @@ -40,6 +40,8 @@ static int __cdecl _vsctprintf( const _TXCHAR *format, va_list ap ) } #endif +#if !defined(__MINGW32__) || defined (__NO_ISOCEXT) + /* This function retrieves the pointer to the last character of a buffer. That is the pointer to the last character of the buffer that fits completly into that buffer or the position of the terminating zero. @@ -122,4 +124,6 @@ _SNPRINTF_DLLIMPORT int __cdecl sntprintf( _TCHAR *buffer, size_t count, const _ return retval; } +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |