diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-06-23 17:58:51 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-06-23 17:58:51 -0700 |
| commit | 9b86d4c12f5f29d0bca5354d4e1ac6b5c828a327 (patch) | |
| tree | 8817ac78ec94cbb3938d6932cb164acadee406d8 | |
| parent | 85e326e7c74268fec4902b9b8b33a310f8c49a42 (diff) | |
Removed conflict markers (ie. <<<<<<<) in llmessage/CMakeLists.txt
Copied snprintf declaration in llstring from login-api-3
| -rw-r--r-- | indra/llcommon/llstring.h | 9 | ||||
| -rw-r--r-- | 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 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 diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt index 3fa6454255..67a171dde6 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) |