From 5b4356cefbaa7dbdc8656e7283c110a893b1a89c Mon Sep 17 00:00:00 2001
From: Aleric Inglewood
Date: Sun, 7 Nov 2010 16:55:50 +0100
Subject: IMP-692: SNOW-713: Global objects in libllcommon duplicated in
 plugins

See http://jira.secondlife.com/browse/SNOW-713

This patch makes llcommon shared. It contains the following snowglobe
(SVN) changesets: 3478, 3479, 3480, 3481, 3482, 3485, 3496, 3498, 3500,
3519 and 3531, plus the fix for all rejects. Note that changes
to scripts/automated_build_scripts/opensrc-build.sh (changesets 3500
and 3625) were ignored as we don't have scripts/automated_build_scripts.
---
 linden/indra/llcommon/llmemory.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'linden/indra/llcommon/llmemory.h')

diff --git a/linden/indra/llcommon/llmemory.h b/linden/indra/llcommon/llmemory.h
index b5c0711..9aa4b85 100644
--- a/linden/indra/llcommon/llmemory.h
+++ b/linden/indra/llcommon/llmemory.h
@@ -45,7 +45,7 @@ const U32 LLREFCOUNT_SENTINEL_VALUE = 0xAAAAAAAA;
 
 //----------------------------------------------------------------------------
 
-class LLMemory
+class LL_COMMON_API LLMemory
 {
 public:
 	static void initClass();
@@ -68,12 +68,12 @@ private:
 
 //----------------------------------------------------------------------------
 
-class LLRefCount
+class LL_COMMON_API LLRefCount
 {
 protected:
-	LLRefCount(const LLRefCount&); // not implemented
+	LLRefCount(const LLRefCount&);
 private:
-	LLRefCount&operator=(const LLRefCount&); // not implemented
+	LLRefCount&operator=(const LLRefCount&);
 
 protected:
 	virtual ~LLRefCount(); // use unref()
@@ -467,6 +467,6 @@ private:
 
 // Return the resident set size of the current process, in bytes.
 // Return value is zero if not known.
-U64 getCurrentRSS();
+LL_COMMON_API U64 getCurrentRSS();
 
 #endif
-- 
cgit v1.1