diff options
| author | Chris Tuchs | 2011-05-08 03:06:23 -0700 |
|---|---|---|
| committer | Chris Tuchs | 2011-05-08 03:06:23 -0700 |
| commit | 7f1cbfae2af93ec11f79b8e2d1db22822ffb6dc7 (patch) | |
| tree | fe9134ed7c34b81a39570d0988b7147f153bd9bb /linden/indra/llcommon/llstring.h | |
| parent | Windows build change I am sure of (diff) | |
| download | meta-impy-7f1cbfae2af93ec11f79b8e2d1db22822ffb6dc7.zip meta-impy-7f1cbfae2af93ec11f79b8e2d1db22822ffb6dc7.tar.gz meta-impy-7f1cbfae2af93ec11f79b8e2d1db22822ffb6dc7.tar.bz2 meta-impy-7f1cbfae2af93ec11f79b8e2d1db22822ffb6dc7.tar.xz | |
Windows build changes, maybe only needed for vc2005. Mostly snprintf -> ll_snprintf, namespace hacks confused vc2005
Diffstat (limited to 'linden/indra/llcommon/llstring.h')
| -rw-r--r-- | linden/indra/llcommon/llstring.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/llcommon/llstring.h b/linden/indra/llcommon/llstring.h index 1717479..881ba83 100644 --- a/linden/indra/llcommon/llstring.h +++ b/linden/indra/llcommon/llstring.h | |||
| @@ -483,12 +483,12 @@ LL_COMMON_API std::string utf8str_removeCRLF(const std::string& utf8str); | |||
| 483 | */ | 483 | */ |
| 484 | 484 | ||
| 485 | // Deal with the differeneces on Windows | 485 | // Deal with the differeneces on Windows |
| 486 | namespace snprintf_hack | 486 | //namespace snprintf_hack |
| 487 | { | 487 | //{ |
| 488 | LL_COMMON_API int snprintf(char *str, size_t size, const char *format, ...); | 488 | LL_COMMON_API int ll_snprintf(char *str, size_t size, const char *format, ...); |
| 489 | } | 489 | //} |
| 490 | 490 | ||
| 491 | using snprintf_hack::snprintf; | 491 | //using snprintf_hack::snprintf; |
| 492 | 492 | ||
| 493 | /** | 493 | /** |
| 494 | * @brief Convert a wide string to std::string | 494 | * @brief Convert a wide string to std::string |