diff options
author | Aleric Inglewood | 2010-11-07 16:55:50 +0100 |
---|---|---|
committer | Aleric Inglewood | 2010-11-07 18:27:48 +0100 |
commit | 5b4356cefbaa7dbdc8656e7283c110a893b1a89c (patch) | |
tree | 43fae9945562c3281746370d623877840ed884b2 /linden/indra/llcommon/llsys.h | |
parent | IMP-688: ERROR: getString: Invalid string control nick01 (diff) | |
download | meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.zip meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.gz meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.bz2 meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.xz |
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.
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llcommon/llsys.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/linden/indra/llcommon/llsys.h b/linden/indra/llcommon/llsys.h index 03f48ca..d5575b2 100644 --- a/linden/indra/llcommon/llsys.h +++ b/linden/indra/llcommon/llsys.h | |||
@@ -45,7 +45,7 @@ | |||
45 | #include <iosfwd> | 45 | #include <iosfwd> |
46 | #include <string> | 46 | #include <string> |
47 | 47 | ||
48 | class LLOSInfo | 48 | class LL_COMMON_API LLOSInfo |
49 | { | 49 | { |
50 | public: | 50 | public: |
51 | LLOSInfo(); | 51 | LLOSInfo(); |
@@ -70,7 +70,7 @@ private: | |||
70 | }; | 70 | }; |
71 | 71 | ||
72 | 72 | ||
73 | class LLCPUInfo | 73 | class LL_COMMON_API LLCPUInfo |
74 | { | 74 | { |
75 | public: | 75 | public: |
76 | LLCPUInfo(); | 76 | LLCPUInfo(); |
@@ -99,7 +99,7 @@ private: | |||
99 | // | 99 | // |
100 | // CLASS LLMemoryInfo | 100 | // CLASS LLMemoryInfo |
101 | 101 | ||
102 | class LLMemoryInfo | 102 | class LL_COMMON_API LLMemoryInfo |
103 | 103 | ||
104 | /*! @brief Class to query the memory subsystem | 104 | /*! @brief Class to query the memory subsystem |
105 | 105 | ||
@@ -123,15 +123,15 @@ public: | |||
123 | }; | 123 | }; |
124 | 124 | ||
125 | 125 | ||
126 | std::ostream& operator<<(std::ostream& s, const LLOSInfo& info); | 126 | LL_COMMON_API std::ostream& operator<<(std::ostream& s, const LLOSInfo& info); |
127 | std::ostream& operator<<(std::ostream& s, const LLCPUInfo& info); | 127 | LL_COMMON_API std::ostream& operator<<(std::ostream& s, const LLCPUInfo& info); |
128 | std::ostream& operator<<(std::ostream& s, const LLMemoryInfo& info); | 128 | LL_COMMON_API std::ostream& operator<<(std::ostream& s, const LLMemoryInfo& info); |
129 | 129 | ||
130 | // gunzip srcfile into dstfile. Returns FALSE on error. | 130 | // gunzip srcfile into dstfile. Returns FALSE on error. |
131 | BOOL gunzip_file(const std::string& srcfile, const std::string& dstfile); | 131 | LL_COMMON_API BOOL gunzip_file(const std::string& srcfile, const std::string& dstfile); |
132 | // gzip srcfile into dstfile. Returns FALSE on error. | 132 | // gzip srcfile into dstfile. Returns FALSE on error. |
133 | BOOL gzip_file(const std::string& srcfile, const std::string& dstfile); | 133 | LL_COMMON_API BOOL gzip_file(const std::string& srcfile, const std::string& dstfile); |
134 | 134 | ||
135 | extern LLCPUInfo gSysCPU; | 135 | LL_COMMON_API extern LLCPUInfo gSysCPU; |
136 | 136 | ||
137 | #endif // LL_LLSYS_H | 137 | #endif // LL_LLSYS_H |