From 3df557435fa3e83a1d0f5f6880aab2e5e6a2ba13 Mon Sep 17 00:00:00 2001
From: brad kittenbrink <brad@lindenlab.com>
Date: Mon, 31 Aug 2009 18:43:12 -0400
Subject: [PATCH] Post-merge cleanups (adding LL_COMMON_API declarations)
---
indra/llcommon/llprocesslauncher.h | 2 +-
indra/llcommon/llstring.h | 2 +-
indra/llxuixml/lluicolor.cpp | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/indra/llcommon/llprocesslauncher.h b/indra/llcommon/llprocesslauncher.h
index a1b8e22691f..880562157fb 100644
--- a/indra/llcommon/llprocesslauncher.h
+++ b/indra/llcommon/llprocesslauncher.h
@@ -42,7 +42,7 @@
It also keeps track of whether the process is still running, and can kill it if required.
*/
-class LLProcessLauncher
+class LL_COMMON_API LLProcessLauncher
{
LOG_CLASS(LLProcessLauncher);
public:
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index f5c6b297b92..0170c0762fd 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -628,7 +628,7 @@ void LLStringUtilBase<T>::getTokens (std::basic_string<T> input, std::vector<std
}
}
-extern LLFastTimer::DeclareTimer STRING_LOCALIZATION;
+extern LL_COMMON_API LLFastTimer::DeclareTimer STRING_LOCALIZATION;
// static
template<class T>
diff --git a/indra/llxuixml/lluicolor.cpp b/indra/llxuixml/lluicolor.cpp
index ef0fa5d6342..fe02907e147 100644
--- a/indra/llxuixml/lluicolor.cpp
+++ b/indra/llxuixml/lluicolor.cpp
@@ -7,6 +7,8 @@
* $/LicenseInfo$
*/
+#include "linden_common.h"
+
#include "lluicolor.h"
LLUIColor::LLUIColor()
--
GitLab