freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2-demos] master 76ad236: * src/ftmemchk.c: Remove internal depe


From: Alexei Podtelezhnikov
Subject: [freetype2-demos] master 76ad236: * src/ftmemchk.c: Remove internal dependency.
Date: Tue, 10 Nov 2020 23:53:46 -0500 (EST)

branch: master
commit 76ad236d5e0f8a24c2cc3053752267a7d13258c6
Author: Alexei Podtelezhnikov <apodtele@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>

    * src/ftmemchk.c: Remove internal dependency.
---
 ChangeLog      |  4 ++++
 src/ftmemchk.c | 25 +++++++++++--------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0bc7296..634268a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2020-11-10  Alexei Podtelezhnikov  <apodtele@gmail.com>
 
+       * src/ftmemchk.c: Remove internal dependency.
+
+2020-11-10  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
        Revert 6ef15ce5aecc, FT_UNUSED is public again.
 
        * mac/ftoldmac.c, src/ftbench.c, src/ftchkwd.c, src/ftcommon.c:
diff --git a/src/ftmemchk.c b/src/ftmemchk.c
index 53340f5..dc3b3bf 100644
--- a/src/ftmemchk.c
+++ b/src/ftmemchk.c
@@ -7,9 +7,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-  /* the following header shouldn't be used in normal programs */
-#include <freetype/internal/compiler-macros.h>
-
 
   FT_Error      error;
 
@@ -115,9 +112,9 @@ void  forget_my_block( void*  base )
   exit(1);
 }
 
-
-FT_CALLBACK_DEF( void* )  my_alloc( FT_Memory  memory,
-                                    long       size )
+static
+void*  my_alloc( FT_Memory  memory,
+                 long       size )
 {
   void*  p = malloc(size);
   if (p)
@@ -127,20 +124,20 @@ FT_CALLBACK_DEF( void* )  my_alloc( FT_Memory  memory,
   return p;
 }
 
-
-FT_CALLBACK_DEF( void )  my_free( FT_Memory  memory,
-                                  void*      block )
+static
+void  my_free( FT_Memory  memory,
+               void*      block )
 {
   memory=memory;
   forget_my_block(block);
   /* free(block);  WE DO NOT REALLY FREE THE BLOCK */
 }
 
-
-FT_CALLBACK_DEF( void* )  my_realloc( FT_Memory  memory,
-                                      long       cur_size,
-                                      long       new_size,
-                                      void*      block )
+static
+void*  my_realloc( FT_Memory  memory,
+                   long       cur_size,
+                   long       new_size,
+                   void*      block )
 {
   void*  p;
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]