diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2011-12-05 09:26:10 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2011-12-05 09:26:10 -0500 |
| commit | 1a6846444f35a89001dffa33d1f76067193165f7 (patch) | |
| tree | 12f4a33da8dbfef4c08ad675e9a8f0b0bba006e4 | |
| parent | 8cbc54d519f8495deee1b1a0da1e08f647ae0cc1 (diff) | |
LLSD-14: Optional entry points need conditional decls turned on.
Changeset 07cd70e75473 moved LLSD::outstandingCount() and allocationCount() to
free functions so we could turn their visibility on/off via LLSD_DEBUG_INFO.
But on some platforms, without proper LL_COMMON_API declarations visible when
we compile llsd.cpp, those free functions lack proper linkage directives.
Declare LLSD_DEBUG_INFO in llsd.cpp so that when the llcommon library is
built, the free functions get proper linkage -- independent of compilations of
LLSD consumers.
| -rw-r--r-- | indra/llcommon/llsd.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llcommon/llsd.cpp b/indra/llcommon/llsd.cpp index 08cb7bd2a8..151eb4084a 100644 --- a/indra/llcommon/llsd.cpp +++ b/indra/llcommon/llsd.cpp @@ -24,6 +24,9 @@ * $/LicenseInfo$ */ +// Must turn on conditional declarations in header file so definitions end up +// with proper linkage. +#define LLSD_DEBUG_INFO #include "linden_common.h" #include "llsd.h" |