summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2011-07-19 10:40:02 -0400
committerNat Goodspeed <nat@lindenlab.com>2011-07-19 10:40:02 -0400
commit25ababd7a6e7a1ab7222b760b7bcc8dde3e6b829 (patch)
tree3595181057164d40e8c8d50d60382cc87569458e /indra
parent5379467ccb2861d2dbcbc8a13f860d9448bd2fb0 (diff)
More FormatMessage compile errors, try again to fix
Diffstat (limited to 'indra')
-rw-r--r--indra/llcommon/tests/llsdserialize_test.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index f2a7530f10..72322c3b72 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -274,7 +274,7 @@ private:
if (0 == GetTempFileNameA(mPath.c_str(), ext.c_str() + pfx_offset, 0, tempname))
{
// I always have to look up this call... :-P
- LPVOID msgptr;
+ LPSTR msgptr;
FormatMessageA(
FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM |
@@ -282,7 +282,7 @@ private:
NULL,
GetLastError(),
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
- LPTSTR(&msgptr),
+ LPSTR(&msgptr), // have to cast (char**) to (char*)
0, NULL );
LL_ERRS("NamedTempFile") << "GetTempFileName(\"" << mPath << "\", \""
<< (ext.c_str() + pfx_offset) << "\") failed: "