diff options
| -rw-r--r-- | lldb/include/lldb/Host/windows/win32.h | 15 | ||||
| -rw-r--r-- | lldb/source/Host/windows/Windows.cpp | 11 |
2 files changed, 18 insertions, 8 deletions
diff --git a/lldb/include/lldb/Host/windows/win32.h b/lldb/include/lldb/Host/windows/win32.h index 6a8c9b7edbc..2789a4b84f0 100644 --- a/lldb/include/lldb/Host/windows/win32.h +++ b/lldb/include/lldb/Host/windows/win32.h @@ -65,8 +65,19 @@ int strcasecmp(const char* s1, const char* s2); int strncasecmp(const char* s1, const char* s2, size_t n); #if _MSC_VER < 1900 -int __declspec(dllexport) -snprintf(char *buffer, size_t count, const char *format, ...); +namespace lldb_private { +int vsnprintf(char *buffer, size_t count, const char *format, va_list argptr); +} + +// inline to avoid linkage conflicts +int inline snprintf(char *buffer, size_t count, const char *format, ...) +{ + va_list argptr; + va_start(argptr, format); + int r = lldb_private::vsnprintf(buffer, count, format, argptr); + va_end(argptr); + return r; +} #endif #define STDIN_FILENO 0 diff --git a/lldb/source/Host/windows/Windows.cpp b/lldb/source/Host/windows/Windows.cpp index cd2cfc96b71..71bff7a9d2e 100644 --- a/lldb/source/Host/windows/Windows.cpp +++ b/lldb/source/Host/windows/Windows.cpp @@ -203,18 +203,17 @@ int usleep(uint32_t useconds) } #if _MSC_VER < 1900 -int snprintf(char *buffer, size_t count, const char *format, ...) +namespace lldb_private { +int vsnprintf(char *buffer, size_t count, const char *format, va_list argptr) { int old_errno = errno; - va_list argptr; - va_start(argptr, format); - int r = vsnprintf(buffer, count, format, argptr); + int r = ::vsnprintf(buffer, count, format, argptr); int new_errno = errno; buffer[count-1] = '\0'; if (r == -1 || r == count) { FILE *nul = fopen("nul", "w"); - int bytes_written = vfprintf(nul, format, argptr); + int bytes_written = ::vfprintf(nul, format, argptr); fclose(nul); if (bytes_written < count) errno = new_errno; @@ -224,9 +223,9 @@ int snprintf(char *buffer, size_t count, const char *format, ...) r = bytes_written; } } - va_end(argptr); return r; } +} // namespace lldb_private #endif #endif // _MSC_VER |
