From fceae96eb171be0396512e251aab311d4e3ef9cc Mon Sep 17 00:00:00 2001 From: Karen Clark Date: Tue, 20 Mar 2007 22:21:42 +0000 Subject: svn merge -r59459:59476 svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release. --- indra/llcommon/llpreprocessor.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/llcommon/llpreprocessor.h') diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h index 8fa171c482..aaecbf3ddc 100644 --- a/indra/llcommon/llpreprocessor.h +++ b/indra/llcommon/llpreprocessor.h @@ -62,9 +62,9 @@ #endif // Deal with the differeneces on Windows -#if defined(LL_WINDOWS) -#define snprintf _snprintf /*Flawfinder: ignore*/ -#endif // LL_WINDOWS +#if LL_WINDOWS +#define snprintf safe_snprintf /* Flawfinder: ignore */ +#endif // LL_WINDOWS // Static linking with apr on windows needs to be declared. #ifdef LL_WINDOWS -- cgit v1.2.3