Merge to XFA: Remove typdefs for pointer types in fx_system.h.
[pdfium.git] / xfa / src / fxjse / src / class.cpp
index 735a77f..42db877 100644 (file)
@@ -168,7 +168,7 @@ CFX_ByteString      CFXJSE_Arguments::GetUTF8String(int32_t index) const
     v8::String::Utf8Value  szStringVal(hString);\r
     return CFX_ByteString(*szStringVal);\r
 }\r
-FX_LPVOID              CFXJSE_Arguments::GetObject(int32_t index, FXJSE_HCLASS hClass ) const\r
+void*          CFXJSE_Arguments::GetObject(int32_t index, FXJSE_HCLASS hClass ) const\r
 {\r
     const CFXJSE_ArgumentsImpl* lpArguments = reinterpret_cast<const CFXJSE_ArgumentsImpl* const>(this);\r
     v8::Local<v8::Value> hValue = (*lpArguments->m_pInfo)[index];\r
@@ -193,7 +193,7 @@ static void FXJSE_Context_GlobalObjToString(const v8::FunctionCallbackInfo<v8::V
     if(info.This() == info.Holder() && lpClass->name) {\r
         CFX_ByteString szStringVal;\r
         szStringVal.Format("[object %s]", lpClass->name);\r
-        info.GetReturnValue().Set(v8::String::NewFromUtf8(info.GetIsolate(), (FX_LPCSTR)szStringVal, v8::String::kNormalString, szStringVal.GetLength()));\r
+        info.GetReturnValue().Set(v8::String::NewFromUtf8(info.GetIsolate(), (const FX_CHAR*)szStringVal, v8::String::kNormalString, szStringVal.GetLength()));\r
     } else {\r
         info.GetReturnValue().Set(info.This()->ObjectProtoToString());\r
     }\r