Merge to XFA: Remove typdefs for pointer types in fx_system.h.
[pdfium.git] / xfa / src / fgas / src / crt / fx_memory.h
index fa58429..9ce8d2f 100644 (file)
@@ -66,7 +66,7 @@ public:
         FXTARGET_Delete this;\r
     }\r
     virtual void*                      Alloc(size_t size);\r
-    virtual void                       Free(FX_LPVOID pBlock) {}\r
+    virtual void                       Free(void* pBlock) {}\r
     virtual size_t                     GetBlockSize() const\r
     {\r
         return 0;\r
@@ -92,11 +92,11 @@ protected:
 #pragma pack(push, 1)\r
 #endif\r
 typedef struct _FX_FIXEDSTORECHUNK {\r
-    FX_LPBYTE                          FirstFlag() const\r
+    uint8_t*                           FirstFlag() const\r
     {\r
-        return (FX_LPBYTE)this + sizeof(_FX_FIXEDSTORECHUNK);\r
+        return (uint8_t*)this + sizeof(_FX_FIXEDSTORECHUNK);\r
     }\r
-    FX_LPBYTE                          FirstBlock() const\r
+    uint8_t*                           FirstBlock() const\r
     {\r
         return FirstFlag() + iChunkSize;\r
     }\r
@@ -118,7 +118,7 @@ public:
         FXTARGET_Delete this;\r
     }\r
     virtual void*                      Alloc(size_t size);\r
-    virtual void                       Free(FX_LPVOID pBlock);\r
+    virtual void                       Free(void* pBlock);\r
     virtual size_t                     GetBlockSize() const\r
     {\r
         return m_iBlockSize;\r
@@ -146,9 +146,9 @@ typedef struct _FX_DYNAMICSTOREBLOCK {
     {\r
         return (_FX_DYNAMICSTOREBLOCK*)(Data() + iBlockSize);\r
     }\r
-    FX_LPBYTE                          Data() const\r
+    uint8_t*                           Data() const\r
     {\r
-        return (FX_LPBYTE)this + sizeof(_FX_DYNAMICSTOREBLOCK);\r
+        return (uint8_t*)this + sizeof(_FX_DYNAMICSTOREBLOCK);\r
     }\r
     size_t             iBlockSize;\r
     FX_BOOL            bUsed;\r
@@ -157,7 +157,7 @@ typedef FX_DYNAMICSTOREBLOCK const * FX_LPCDYNAMICSTOREBLOCK;
 typedef struct _FX_DYNAMICSTORECHUNK {\r
     FX_LPDYNAMICSTOREBLOCK     FirstBlock() const\r
     {\r
-        return (FX_LPDYNAMICSTOREBLOCK)((FX_LPBYTE)this + sizeof(_FX_DYNAMICSTORECHUNK));\r
+        return (FX_LPDYNAMICSTOREBLOCK)((uint8_t*)this + sizeof(_FX_DYNAMICSTORECHUNK));\r
     }\r
     _FX_DYNAMICSTORECHUNK*     pNextChunk;\r
     size_t                                     iChunkSize;\r
@@ -177,7 +177,7 @@ public:
         FXTARGET_Delete this;\r
     }\r
     virtual void*              Alloc(size_t size);\r
-    virtual void               Free(FX_LPVOID pBlock);\r
+    virtual void               Free(void* pBlock);\r
     virtual size_t             GetBlockSize() const\r
     {\r
         return 0;\r