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.

3 files changed, 3 insertions, 3 deletions

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp
index b521222f00..ab2702e343 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp
@@ -28,7 +28,7 @@
 #include "../common/BC_CommonDecoderResult.h"

 #include "BC_QRCoderMode.h"

 #include "BC_QRDecodedBitStreamParser.h"

-FX_LPCSTR CBC_QRDecodedBitStreamParser::UTF_8 = "utf8";

+const FX_CHAR* CBC_QRDecodedBitStreamParser::UTF_8 = "utf8";

 const FX_CHAR CBC_QRDecodedBitStreamParser::ALPHANUMERIC_CHARS[45] = {

     '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B',

     'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h
index d607e72da8..e6b556e1e1 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h
@@ -15,7 +15,7 @@ class CBC_QRDecodedBitStreamParser
 {

 private:

     const static FX_CHAR ALPHANUMERIC_CHARS[45];

-    static FX_LPCSTR UTF_8;

+    static const FX_CHAR* UTF_8;

     CBC_QRDecodedBitStreamParser();

 public:

     virtual ~CBC_QRDecodedBitStreamParser();

diff --git a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp
index 975776db3f..0ff22c77dd 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp
@@ -412,7 +412,7 @@ FX_BOOL CBC_QRFinderPatternFinder::HaveMultiplyConfirmedCenters()
     }

     return totalDeviation <= 0.05f * totalModuleSize;

 }

-inline FX_BOOL centerComparator(FX_LPVOID a, FX_LPVOID b)

+inline FX_BOOL centerComparator(void* a, void* b)

 {

     return ((CBC_QRFinderPattern*)b)->GetCount() < ((CBC_QRFinderPattern*)a)->GetCount();

 }