diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2008-04-03 22:50:22 +0000 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2008-04-03 22:50:22 +0000 |
| commit | dc48f1c7417f0f49ad1bd32330845ce17a29eece (patch) | |
| tree | 8772aff5f32c1702228b7ca7e324fbd077269854 /indra/llcommon/llpreprocessor.h | |
| parent | b5936a4b1d8780b5b8cd425998eacd2c64ffa693 (diff) | |
svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release
HAVOK4 IN TEH HOUSE!!11!!ONE!!
If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this.
QAR-448
Diffstat (limited to 'indra/llcommon/llpreprocessor.h')
| -rw-r--r-- | indra/llcommon/llpreprocessor.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h index ac06b431c1..454a820ce5 100644 --- a/indra/llcommon/llpreprocessor.h +++ b/indra/llcommon/llpreprocessor.h @@ -79,9 +79,16 @@ #endif + // Deal with the differeneces on Windows #if LL_MSVC -#define snprintf safe_snprintf /* Flawfinder: ignore */ +namespace snprintf_hack +{ + int snprintf(char *str, size_t size, const char *format, ...); +} + +// #define snprintf safe_snprintf /* Flawfinder: ignore */ +using snprintf_hack::snprintf; #endif // LL_MSVC // Static linking with apr on windows needs to be declared. |