freetype-commit
[Top][All Lists]
Advanced

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

[freetype2] master 4554c6d 32/68: * builds/windows/ftdebug.c: Synchroniz


From: Werner Lemberg
Subject: [freetype2] master 4554c6d 32/68: * builds/windows/ftdebug.c: Synchronize with `src/base/ftdebug.c`.
Date: Fri, 5 Mar 2021 09:29:38 -0500 (EST)

branch: master
commit 4554c6da427579b9eee428838823937cc624317b
Author: Werner Lemberg <wl@gnu.org>
Commit: Werner Lemberg <wl@gnu.org>

    * builds/windows/ftdebug.c: Synchronize with `src/base/ftdebug.c`.
---
 ChangeLog                |  5 ++++-
 builds/windows/ftdebug.c | 34 ++++++++++++++++++++++++++++++++--
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 119e71d..319a989 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2021-01-31  Werner Lemberg  <wl@gnu.org>
 
+       * builds/windows/ftdebug.c: Synchronize with `src/base/ftdebug.c`.
+
+2021-01-31  Werner Lemberg  <wl@gnu.org>
+
        Always provide logging API.
 
        It's easier to have stubs if FT_DEBUG_LOGGING is undefined than to
@@ -8,7 +12,6 @@
        Problem reported by Alexei.
 
        * src/base/ftdebug.c: Include `ftlogging.h`.
-
        (FT_Trace_Set_Level, FT_Trace_Set_Default_Level, FT_Set_Log_Handler,
        FT_Set_Default_Log_Handler) [!FT_DEBUG_LOGGING]: Provide stubs.
 
diff --git a/builds/windows/ftdebug.c b/builds/windows/ftdebug.c
index 4c0bf5e..a1aedb8 100644
--- a/builds/windows/ftdebug.c
+++ b/builds/windows/ftdebug.c
@@ -42,6 +42,7 @@
 
 
 #include <freetype/freetype.h>
+#include <freetype/ftlogging.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftobjs.h>
 
@@ -602,7 +603,7 @@
   /* documentation is in ftlogging.h */
 
   FT_EXPORT_DEF( void )
-  FT_Set_Default_Log_Handler()
+  FT_Set_Default_Log_Handler( void )
   {
     custom_output_handler = NULL;
   }
@@ -621,7 +622,36 @@
     va_end( ap );
   }
 
-#endif /* FT_DEBUG_LOGGING */
+#else /* !FT_DEBUG_LOGGING */
+
+  FT_EXPORT_DEF( void )
+  FT_Trace_Set_Level( const char*  level )
+  {
+    FT_UNUSED( level );
+  }
+
+
+  FT_EXPORT_DEF( void )
+  FT_Trace_Set_Default_Level( void )
+  {
+    /* nothing */
+  }
+
+
+  FT_EXPORT_DEF( void )
+  FT_Set_Log_Handler( FT_Custom_Log_Handler  handler )
+  {
+    FT_UNUSED( handler );
+  }
+
+
+  FT_EXPORT_DEF( void )
+  FT_Set_Default_Log_Handler( void )
+  {
+    /* nothing */
+  }
+
+#endif /* !FT_DEBUG_LOGGING */
 
 
 /* END */



reply via email to

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