4 files changed, 17 insertions, 28 deletions

diff --git a/third_party/agg23/agg_array.h b/third_party/agg23/agg_array.h
index 204ae2e7a2..d521b04606 100644
--- a/third_party/agg23/agg_array.h
+++ b/third_party/agg23/agg_array.h
@@ -40,10 +40,7 @@ public:
     }
     void allocate(unsigned size, unsigned extra_tail = 0);
     void resize(unsigned new_size);
-    void zero()
-    {
-        FXSYS_memset(m_array, 0, sizeof(T) * m_size);
-    }
+    void zero() { memset(m_array, 0, sizeof(T) * m_size); }
     void add(const T& v)
     {
         m_array[m_size++] = v;
@@ -130,7 +127,7 @@ void pod_array<T>::resize(unsigned new_size)
     if(new_size > m_size) {
         if(new_size > m_capacity) {
             T* data = FX_Alloc(T, new_size);
-            FXSYS_memcpy(data, m_array, m_size * sizeof(T));
+            memcpy(data, m_array, m_size * sizeof(T));
             FX_Free(m_array);
             m_array = data;
         }
@@ -145,14 +142,14 @@ template<class T> pod_array<T>::pod_array(const pod_array<T>& v) :
     m_capacity(v.m_capacity),
     m_array(v.m_capacity ? FX_Alloc(T, v.m_capacity) : 0)
 {
-    FXSYS_memcpy(m_array, v.m_array, sizeof(T) * v.m_size);
+  memcpy(m_array, v.m_array, sizeof(T) * v.m_size);
 }
 template<class T> const pod_array<T>&
 pod_array<T>::operator = (const pod_array<T>&v)
 {
     allocate(v.m_size);
     if(v.m_size) {
-        FXSYS_memcpy(m_array, v.m_array, sizeof(T) * v.m_size);
+      memcpy(m_array, v.m_array, sizeof(T) * v.m_size);
     }
     return *this;
 }
@@ -322,7 +319,7 @@ pod_deque<T, S>::pod_deque(const pod_deque<T, S>& v) :
     unsigned i;
     for(i = 0; i < v.m_num_blocks; ++i) {
         m_blocks[i] = FX_Alloc(T, block_size);
-        FXSYS_memcpy(m_blocks[i], v.m_blocks[i], block_size * sizeof(T));
+        memcpy(m_blocks[i], v.m_blocks[i], block_size * sizeof(T));
     }
 }
 template<class T, unsigned S>
@@ -333,7 +330,7 @@ const pod_deque<T, S>& pod_deque<T, S>::operator = (const pod_deque<T, S>& v)
         allocate_block(i);
     }
     for(i = 0; i < v.m_num_blocks; ++i) {
-        FXSYS_memcpy(m_blocks[i], v.m_blocks[i], block_size * sizeof(T));
+      memcpy(m_blocks[i], v.m_blocks[i], block_size * sizeof(T));
     }
     m_size = v.m_size;
     return *this;
@@ -344,10 +341,8 @@ void pod_deque<T, S>::allocate_block(unsigned nb)
     if(nb >= m_max_blocks) {
         T** new_blocks = FX_Alloc(T*, m_max_blocks + m_block_ptr_inc);
         if(m_blocks) {
-            FXSYS_memcpy(new_blocks,
-                         m_blocks,
-                         m_num_blocks * sizeof(T*));
-            FX_Free(m_blocks);
+          memcpy(new_blocks, m_blocks, m_num_blocks * sizeof(T*));
+          FX_Free(m_blocks);
         }
         m_blocks = new_blocks;
         m_max_blocks += m_block_ptr_inc;
@@ -476,10 +471,8 @@ private:
         if(m_num_blocks >= m_max_blocks) {
             int8u** new_blocks = FX_Alloc(int8u*, m_max_blocks + m_block_ptr_inc);
             if(m_blocks) {
-                FXSYS_memcpy(new_blocks,
-                             m_blocks,
-                             m_num_blocks * sizeof(int8u*));
-                FX_Free(m_blocks);
+              memcpy(new_blocks, m_blocks, m_num_blocks * sizeof(int8u*));
+              FX_Free(m_blocks);
             }
             m_blocks = new_blocks;
             m_max_blocks += m_block_ptr_inc;
diff --git a/third_party/agg23/agg_path_storage.cpp b/third_party/agg23/agg_path_storage.cpp
index 747777d28e..c24f7952ba 100644
--- a/third_party/agg23/agg_path_storage.cpp
+++ b/third_party/agg23/agg_path_storage.cpp
@@ -57,13 +57,9 @@ void path_storage::allocate_block(unsigned nb)
         unsigned char** new_cmds =
             (unsigned char**)(new_coords + m_max_blocks + block_pool);
         if(m_coord_blocks) {
-            FXSYS_memcpy(new_coords,
-                           m_coord_blocks,
-                           m_max_blocks * sizeof(float*));
-            FXSYS_memcpy(new_cmds,
-                           m_cmd_blocks,
-                           m_max_blocks * sizeof(unsigned char*));
-            FX_Free(m_coord_blocks);
+          memcpy(new_coords, m_coord_blocks, m_max_blocks * sizeof(float*));
+          memcpy(new_cmds, m_cmd_blocks, m_max_blocks * sizeof(unsigned char*));
+          FX_Free(m_coord_blocks);
         }
         m_coord_blocks = new_coords;
         m_cmd_blocks = new_cmds;
diff --git a/third_party/agg23/agg_rasterizer_scanline_aa.cpp b/third_party/agg23/agg_rasterizer_scanline_aa.cpp
index af6dd58fe3..c90bdafdd0 100644
--- a/third_party/agg23/agg_rasterizer_scanline_aa.cpp
+++ b/third_party/agg23/agg_rasterizer_scanline_aa.cpp
@@ -118,8 +118,8 @@ void outline_aa::allocate_block()
         if(m_num_blocks >= m_max_blocks) {
             cell_aa** new_cells = FX_Alloc( cell_aa*, m_max_blocks + cell_block_pool);
             if(m_cells) {
-                FXSYS_memcpy(new_cells, m_cells, m_max_blocks * sizeof(cell_aa*));
-                FX_Free(m_cells);
+              memcpy(new_cells, m_cells, m_max_blocks * sizeof(cell_aa*));
+              FX_Free(m_cells);
             }
             m_cells = new_cells;
             m_max_blocks += cell_block_pool;
diff --git a/third_party/agg23/agg_scanline_u.h b/third_party/agg23/agg_scanline_u.h
index 2100115329..844dc9aad3 100644
--- a/third_party/agg23/agg_scanline_u.h
+++ b/third_party/agg23/agg_scanline_u.h
@@ -83,7 +83,7 @@ public:
     void add_cells(int x, unsigned len, const CoverT* covers)
     {
         x -= m_min_x;
-        FXSYS_memcpy(m_covers + x, covers, len * sizeof(CoverT));
+        memcpy(m_covers + x, covers, len * sizeof(CoverT));
         if(x == m_last_x + 1) {
             m_cur_span->len += (coord_type)len;
         } else {
@@ -97,7 +97,7 @@ public:
     void add_span(int x, unsigned len, unsigned cover)
     {
         x -= m_min_x;
-        FXSYS_memset(m_covers + x, cover, len);
+        memset(m_covers + x, cover, len);
         if(x == m_last_x + 1) {
             m_cur_span->len += (coord_type)len;
         } else {