Removed conflict markers (ie. <<<<<<<) in llmessage/CMakeLists.txt

Copied snprintf declaration in llstring from login-api-3

1 files changed, 8 insertions, 1 deletions

diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index 91b706a5be..813e2656ae 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -521,7 +521,14 @@ std::string utf8str_removeCRLF(const std::string& utf8str);
  * formatted string.
  *
  */
-int safe_snprintf(char* str, size_t size, const char* format, ...);
+
+// Deal with the differeneces on Windows

+namespace snprintf_hack

+{

+	LL_COMMON_API int snprintf(char *str, size_t size, const char *format, ...);

+}

+

+using snprintf_hack::snprintf;

 
 /**
  * @brief Convert a wide string to std::string