diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-03-03 11:10:18 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-03-06 09:21:24 +0000 |
commit | 0ea05f930fb6811da33606cf546057e11a96361c (patch) | |
tree | 555eecafc2f850c663180f3d516bcc74abae24e9 /onlineupdate | |
parent | fc5acf0f608ed279f719e38f9a6e80c326b93fa8 (diff) |
drop various _MSC_VER < 1900 conditionals
Change-Id: I68d93b260db1f542bb3b44858b61b2d30ae93530
Reviewed-on: https://gerrit.libreoffice.org/34856
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'onlineupdate')
-rw-r--r-- | onlineupdate/source/update/common/updatedefines.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/onlineupdate/source/update/common/updatedefines.h b/onlineupdate/source/update/common/updatedefines.h index 73473109e2ae..95969b169426 100644 --- a/onlineupdate/source/update/common/updatedefines.h +++ b/onlineupdate/source/update/common/updatedefines.h @@ -38,9 +38,6 @@ # define access _access # define putenv _putenv -# if _MSC_VER < 1900 -# define stat _stat -# endif # define DELETE_DIR L"tobedeleted" # define CALLBACK_BACKUP_EXT L".moz-callback" @@ -48,25 +45,6 @@ # define NS_T(str) L ## str # define NS_SLASH NS_T('\\') -#if defined(_MSC_VER) && _MSC_VER < 1900 -// On Windows, _snprintf and _snwprintf don't guarantee null termination. These -// macros always leave room in the buffer for null termination and set the end -// of the buffer to null in case the string is larger than the buffer. Having -// multiple nulls in a string is fine and this approach is simpler (possibly -// faster) than calculating the string length to place the null terminator and -// truncates the string as _snprintf and _snwprintf do on other platforms. -static inline int mysnprintf(char* dest, size_t count, const char* fmt, ...) -{ - size_t _count = count - 1; - va_list varargs; - va_start(varargs, fmt); - int result = _vsnprintf(dest, count - 1, fmt, varargs); - va_end(varargs); - dest[_count] = '\0'; - return result; -} -#define snprintf mysnprintf -#endif static inline int mywcsprintf(WCHAR* dest, size_t count, const WCHAR* fmt, ...) { size_t _count = count - 1; |