From d7e5cc754a937605d1f73db5e7967c58ddd80742 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 10 Jun 2015 14:33:37 -0700 Subject: Merge to XFA: Remove typdefs for pointer types in fx_system.h. Original Review URL: https://codereview.chromium.org/1171733003 R=thestig@chromium.org Review URL: https://codereview.chromium.org/1178613002. --- xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp') diff --git a/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp index 8a0271f1a0..cc46b8156d 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp @@ -131,7 +131,7 @@ CFX_WideString CBC_EdifactEncoder::encodeToCodewords(CFX_WideString sb, int32_t int32_t len = sb.GetLength() - startPos; if (len == 0) { e = BCExceptionNoContents; - return (FX_LPWSTR)""; + return (FX_WCHAR*)""; } FX_WCHAR c1 = sb.GetAt(startPos); FX_WCHAR c2 = len >= 2 ? sb.GetAt(startPos + 1) : 0; -- cgit v1.2.3