From 9b86d4c12f5f29d0bca5354d4e1ac6b5c828a327 Mon Sep 17 00:00:00 2001
From: "Mark Palange (Mani)" <palange@lindenlab.com>
Date: Tue, 23 Jun 2009 17:58:51 -0700
Subject: [PATCH] Removed conflict markers (ie. <<<<<<<) in
llmessage/CMakeLists.txt Copied snprintf declaration in llstring from
login-api-3
---
indra/llcommon/llstring.h | 9 ++++++++-
indra/llmessage/CMakeLists.txt | 9 +--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index 91b706a5bee..813e2656ae2 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
diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt
index 3fa64542556..67a171dde6f 100644
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -229,12 +229,5 @@ IF (NOT LINUX AND VIEWER)
# llareslistener.cpp
)
LL_ADD_PROJECT_UNIT_TESTS(llmessage "${llmessage_TEST_SOURCE_FILES}")
-
-<<<<<<< local
- # Commented out - see rationale at bottom of newview's build file + poppy 2009-06-05
- # Don't make llmessage depend on llsdmessage_test because ADD_COMM_BUILD_TEST depends on llmessage!
- # ADD_COMM_BUILD_TEST(llsdmessage "" "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_llsdmessage_peer.py")
-# ADD_BUILD_TEST(llareslistener llmessage)
-=======
->>>>>>> other
+
ENDIF (NOT LINUX AND VIEWER)
--
GitLab