Werner Lemberg pushed to branch master at FreeType / FreeType
Commits:
-
4554c6da
by Werner Lemberg at 2021-01-31T17:17:40+01:00
2 changed files:
Changes:
| 1 |
+2021-01-31 Werner Lemberg <wl@gnu.org>
|
|
| 2 |
+ |
|
| 3 |
+ * builds/windows/ftdebug.c: Synchronize with `src/base/ftdebug.c`.
|
|
| 4 |
+ |
|
| 1 | 5 |
2021-01-31 Werner Lemberg <wl@gnu.org>
|
| 2 | 6 |
|
| 3 | 7 |
Always provide logging API.
|
| ... | ... | @@ -8,7 +12,6 @@ |
| 8 | 12 |
Problem reported by Alexei.
|
| 9 | 13 |
|
| 10 | 14 |
* src/base/ftdebug.c: Include `ftlogging.h`.
|
| 11 |
- |
|
| 12 | 15 |
(FT_Trace_Set_Level, FT_Trace_Set_Default_Level, FT_Set_Log_Handler,
|
| 13 | 16 |
FT_Set_Default_Log_Handler) [!FT_DEBUG_LOGGING]: Provide stubs.
|
| 14 | 17 |
|
| ... | ... | @@ -42,6 +42,7 @@ |
| 42 | 42 |
|
| 43 | 43 |
|
| 44 | 44 |
#include <freetype/freetype.h>
|
| 45 |
+#include <freetype/ftlogging.h>
|
|
| 45 | 46 |
#include <freetype/internal/ftdebug.h>
|
| 46 | 47 |
#include <freetype/internal/ftobjs.h>
|
| 47 | 48 |
|
| ... | ... | @@ -602,7 +603,7 @@ |
| 602 | 603 |
/* documentation is in ftlogging.h */
|
| 603 | 604 |
|
| 604 | 605 |
FT_EXPORT_DEF( void )
|
| 605 |
- FT_Set_Default_Log_Handler()
|
|
| 606 |
+ FT_Set_Default_Log_Handler( void )
|
|
| 606 | 607 |
{
|
| 607 | 608 |
custom_output_handler = NULL;
|
| 608 | 609 |
}
|
| ... | ... | @@ -621,7 +622,36 @@ |
| 621 | 622 |
va_end( ap );
|
| 622 | 623 |
}
|
| 623 | 624 |
|
| 624 |
-#endif /* FT_DEBUG_LOGGING */
|
|
| 625 |
+#else /* !FT_DEBUG_LOGGING */
|
|
| 626 |
+ |
|
| 627 |
+ FT_EXPORT_DEF( void )
|
|
| 628 |
+ FT_Trace_Set_Level( const char* level )
|
|
| 629 |
+ {
|
|
| 630 |
+ FT_UNUSED( level );
|
|
| 631 |
+ }
|
|
| 632 |
+ |
|
| 633 |
+ |
|
| 634 |
+ FT_EXPORT_DEF( void )
|
|
| 635 |
+ FT_Trace_Set_Default_Level( void )
|
|
| 636 |
+ {
|
|
| 637 |
+ /* nothing */
|
|
| 638 |
+ }
|
|
| 639 |
+ |
|
| 640 |
+ |
|
| 641 |
+ FT_EXPORT_DEF( void )
|
|
| 642 |
+ FT_Set_Log_Handler( FT_Custom_Log_Handler handler )
|
|
| 643 |
+ {
|
|
| 644 |
+ FT_UNUSED( handler );
|
|
| 645 |
+ }
|
|
| 646 |
+ |
|
| 647 |
+ |
|
| 648 |
+ FT_EXPORT_DEF( void )
|
|
| 649 |
+ FT_Set_Default_Log_Handler( void )
|
|
| 650 |
+ {
|
|
| 651 |
+ /* nothing */
|
|
| 652 |
+ }
|
|
| 653 |
+ |
|
| 654 |
+#endif /* !FT_DEBUG_LOGGING */
|
|
| 625 | 655 |
|
| 626 | 656 |
|
| 627 | 657 |
/* END */
|