Commit 015a9b8d8f6f4e775ff40581e8ac7a0116174b04

Werner Lemberg 2020-12-07T10:27:42

*/*: s/FT_LOGGING/FT_DEBUG_LOGGING/.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
diff --git a/ChangeLog b/ChangeLog
index 0b5030e..30b422c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2020-12-07  Werner Lemberg  <wl@gnu.org>
+
+	*/*: s/FT_LOGGING/FT_DEBUG_LOGGING/.
+
 2020-12-05  Werner Lemberg  <wl@gnu.org>
 
 	* builds/toplevel.mk (do-dist): Remove `submodules` directory.
diff --git a/README.git b/README.git
index 1da3fa8..265643d 100644
--- a/README.git
+++ b/README.git
@@ -35,9 +35,9 @@ Similarly, a  build with  `cmake' can  be done  directly from  the git
 repository.
 
 
-For using the `FT_LOGGING' macro while debugging (see `docs/DEBUG' for
-more information)  use the  following git  commands to  checkout `dlg'
-library as a git submodule.
+For   using  the   `FT_DEBUG_LOGGING'  macro   while  debugging   (see
+`docs/DEBUG' for more  information) use the following  git commands to
+checkout `dlg' library as a git submodule.
 
   git submodule init
   git submodule update
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index f5cf34a..1b637e6 100644
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -1128,9 +1128,9 @@ fi
 if test "$have_pthread" != no; then
   CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
   LDFLAGS="$LDFLAGS $PTHREAD_CFLAGS $PTHREAD_LIBS"
-  ftoption_set FT_LOGGING
+  ftoption_set FT_DEBUG_LOGGING
 else
-  ftoption_unset FT_LOGGING
+  ftoption_unset FT_DEBUG_LOGGING
 fi
 
 AC_SUBST([CFLAGS])
@@ -1185,7 +1185,7 @@ fi
 
 if test $have_pthread = no; then
   AC_MSG_WARN([
-  \`FT_LOGGING' will not work since the \`pthread' library is not available.
+  \`FT_DEBUG_LOGGING' will not work since the \`pthread' library is not available.
   ])
 fi
 
diff --git a/builds/windows/ftdebug.c b/builds/windows/ftdebug.c
index 389b9d8..11d7ff6 100644
--- a/builds/windows/ftdebug.c
+++ b/builds/windows/ftdebug.c
@@ -46,7 +46,7 @@
 #include <freetype/internal/ftobjs.h>
 
 
-#ifdef FT_LOGGING
+#ifdef FT_DEBUG_LOGGING
 
   /**************************************************************************
    *
@@ -87,7 +87,7 @@
   dlg_handler            ft_default_log_handler = NULL;
   FT_Custom_Log_Handler  custom_output_handler  = NULL;
 
-#endif /* FT_LOGGING*/
+#endif /* FT_DEBUG_LOGGING*/
 
 
 #ifdef FT_DEBUG_LEVEL_ERROR
@@ -255,7 +255,7 @@
     const char*  ft2_debug = NULL;
 
 
-#ifdef FT_LOGGING
+#ifdef FT_DEBUG_LOGGING
     if ( ft_custom_trace_level != NULL )
       ft2_debug = ft_custom_trace_level;
     else
@@ -276,7 +276,7 @@
         if ( *p == ' ' || *p == '\t' || *p == ',' || *p == ';' || *p == '=' )
           continue;
 
-#ifdef FT_LOGGING
+#ifdef FT_DEBUG_LOGGING
 
         /* check extra arguments for logging */
         if ( *p == '-' )
@@ -317,7 +317,7 @@
           }
         }
 
-#endif /* FT_LOGGING */
+#endif /* FT_DEBUG_LOGGING */
 
         /* read toggle name, followed by ':' */
         q = p;
@@ -423,7 +423,7 @@
 #endif /* !FT_DEBUG_LEVEL_TRACE */
 
 
-#ifdef FT_LOGGING
+#ifdef FT_DEBUG_LOGGING
 
   /**************************************************************************
    *
@@ -621,7 +621,7 @@
     va_end( ap );
   }
 
-#endif /* FT_LOGGING */
+#endif /* FT_DEBUG_LOGGING */
 
 
 /* END */
diff --git a/builds/windows/vc2010/freetype.vcxproj b/builds/windows/vc2010/freetype.vcxproj
index 41080fe..0ae9d8c 100644
--- a/builds/windows/vc2010/freetype.vcxproj
+++ b/builds/windows/vc2010/freetype.vcxproj
@@ -90,7 +90,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\src\dlg\;$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;DLL_EXPORT;FT_LOGGING;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;DLL_EXPORT;FT_DEBUG_LOGGING;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <DisableLanguageExtensions>false</DisableLanguageExtensions>
@@ -119,7 +119,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\src\dlg\;$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;DLL_EXPORT;FT_LOGGING;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;DLL_EXPORT;FT_DEBUG_LOGGING;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <DisableLanguageExtensions>false</DisableLanguageExtensions>
@@ -148,7 +148,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\src\dlg;$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;FT_LOGGING;DLG_STATIC;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;FT_DEBUG_LOGGING;DLG_STATIC;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <DisableLanguageExtensions>false</DisableLanguageExtensions>
@@ -177,7 +177,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\src\dlg;$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;FT_LOGGING;DLG_STATIC;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;FT_DEBUG_LOGGING;DLG_STATIC;$(UserDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <DisableLanguageExtensions>false</DisableLanguageExtensions>
diff --git a/devel/ftoption.h b/devel/ftoption.h
index 7162b70..a845207 100644
--- a/devel/ftoption.h
+++ b/devel/ftoption.h
@@ -443,7 +443,7 @@ FT_BEGIN_HEADER
    *   to a file, FreeType uses an the external `dlg` library (the source
    *   code is in `src/dlg`).
    */
-#define FT_LOGGING
+#define FT_DEBUG_LOGGING
 
 
   /**************************************************************************
diff --git a/docs/CHANGES b/docs/CHANGES
index bdd9496..7aba98b 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -12,10 +12,10 @@ CHANGES BETWEEN 2.10.4 and 2.11.0
   - `ttdebug' didn't show changed point coordinates (bug introduced in
     version 2.10.3).
 
-  - A new configuration macro  `FT_LOGGING` is available.  It provides
-    extended debugging capabilities for  FreeType, for example showing
-    a time stamp  or displaying the component a  tracing message comes
-    from.  See file `docs/DEBUG` for more information.
+  - A  new configuration  macro `FT_DEBUG_LOGGING`  is available.   It
+    provides extended debugging capabilities for FreeType, for example
+    showing a time stamp or displaying the component a tracing message
+    comes from.  See file `docs/DEBUG` for more information.
 
     This work was Priyesh Kumar's GSoC 2020 project.
 
diff --git a/docs/DEBUG b/docs/DEBUG
index 48bea34..8366d50 100644
--- a/docs/DEBUG
+++ b/docs/DEBUG
@@ -44,7 +44,7 @@ located in the file `ftoption.h'.  The macros are:
     When `FT2_DEBUG_MEMORY'  isn't defined  at runtime,  the debugging
     memory manager is ignored, and performance is unaffected.
 
-  FT_LOGGING
+  FT_DEBUG_LOGGING
 
     #define this macro for enhanced logging support; it automatically
     sets `FT_DEBUG_LEVEL_TRACE' and `FT_DEBUG_LEVEL_ERROR'.
@@ -165,7 +165,7 @@ behaviour of FreeType at runtime.
     the memory and io components, which  are set to the trace levels 5
     and 4, respectively.
 
-    If `FT_LOGGING' is defined, two more options are available.
+    If `FT_DEBUG_LOGGING' is defined, two more options are available.
 
     * -v: Print also  the name of FreeType's component  from which the
           current log is produced.
@@ -190,8 +190,8 @@ behaviour of FreeType at runtime.
   FT_LOGGING_FILE
 
     This  variable  is  only  used  if  FreeType  is  built  with  the
-    `FT_LOGGING'  macro defined.   It contains  the path  to the  file
-    where the  user wants  to put  his log  file.  If  it is  not set,
+    `FT_DEBUG_LOGGING'  macro defined.   It contains  the path  to the
+    file where the user wants to put  his log file.  If it is not set,
     FreeType uses stderr.
 
     Examples:
@@ -254,10 +254,10 @@ behaviour of FreeType at runtime.
     freed blocks are released at runtime.
 
 
-IV. Additional Capabilities with `FT_LOGGING'
----------------------------------------------
+IV. Additional Capabilities with `FT_DEBUG_LOGGING'
+---------------------------------------------------
 
-If  `FT_LOGGING'  is  defined,  four APIs  are  available  to  provide
+If `FT_DEBUG_LOGGING' is  defined, four APIs are  available to provide
 additional debugging support.  Use
 
   #include<freetype/ftlogging.h>
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index 4d6bfa1..147fe6d 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -445,7 +445,7 @@ FT_BEGIN_HEADER
    *
    *   This option needs a C99 compiler.
    */
-/* #define FT_LOGGING */
+/* #define FT_DEBUG_LOGGING */
 
 
   /**************************************************************************
diff --git a/include/freetype/ftlogging.h b/include/freetype/ftlogging.h
index 6f65ec7..2880f94 100644
--- a/include/freetype/ftlogging.h
+++ b/include/freetype/ftlogging.h
@@ -36,11 +36,11 @@ FT_BEGIN_HEADER
    *   External Debugging APIs
    *
    * @abstract:
-   *   Public APIs to control the `FT_LOGGING` macro.
+   *   Public APIs to control the `FT_DEBUG_LOGGING` macro.
    *
    * @description:
    *   This section contains the declarations of public functions that
-   *   enables fine control of what the `FT_LOGGING` macro outputs.
+   *   enables fine control of what the `FT_DEBUG_LOGGING` macro outputs.
    *
    */
 
@@ -66,8 +66,8 @@ FT_BEGIN_HEADER
    *   ```
    *
    * @note:
-   *   This function is only available if compilation option `@FT_LOGGING`
-   *   is set.
+   *   This function is only available if compilation option
+   *   `FT_DEBUG_LOGGING` is set.
    */
   FT_EXPORT( void )
   FT_Trace_Set_Level( const char*  tracing_level );
@@ -85,8 +85,8 @@ FT_BEGIN_HEADER
    *
    *
    * @note:
-   *   This function is only available if compilation option `@FT_LOGGING`
-   *   is set.
+   *   This function is only available if compilation option
+   *   `FT_DEBUG_LOGGING` is set.
    */
   FT_EXPORT( void )
   FT_Trace_Set_Default_Level( void );
@@ -131,8 +131,8 @@ FT_BEGIN_HEADER
    *     New logging function.
    *
    * @note:
-   *   This function is only available if compilation option `@FT_LOGGING`
-   *   is set.
+   *   This function is only available if compilation option
+   *   `FT_DEBUG_LOGGING` is set.
    */
   FT_EXPORT( void )
   FT_Set_Log_Handler( FT_Custom_Log_Handler  handler );
@@ -148,8 +148,8 @@ FT_BEGIN_HEADER
    *   log handler to FreeType's built-in version.
    *
    * @note:
-   *   This function is only available if compilation option `@FT_LOGGING`
-   *   is set.
+   *   This function is only available if compilation option
+   *   `FT_DEBUG_LOGGING` is set.
    */
   FT_EXPORT( void )
   FT_Set_Default_Log_Handler( void );
diff --git a/include/freetype/internal/ftdebug.h b/include/freetype/internal/ftdebug.h
index 9d83f97..655b50a 100644
--- a/include/freetype/internal/ftdebug.h
+++ b/include/freetype/internal/ftdebug.h
@@ -31,20 +31,20 @@
 
 #include "compiler-macros.h"
 
-#ifdef FT_LOGGING
+#ifdef FT_DEBUG_LOGGING
 #include <../src/dlg/dlg/dlg.h>
 #include <../src/dlg/dlg/output.h>
 
 #include <freetype/ftlogging.h>
-#endif /* FT_LOGGING */
+#endif /* FT_DEBUG_LOGGING */
 
 
 FT_BEGIN_HEADER
 
-  /* force the definition of FT_DEBUG_LEVEL_TRACE if FT_LOGGING is */
-  /* already defined.                                              */
-  /*                                                               */
-#ifdef FT_LOGGING
+  /* force the definition of FT_DEBUG_LEVEL_TRACE if FT_DEBUG_LOGGING is */
+  /* already defined.                                                    */
+  /*                                                                     */
+#ifdef FT_DEBUG_LOGGING
 #undef  FT_DEBUG_LEVEL_TRACE
 #define FT_DEBUG_LEVEL_TRACE
 #endif
@@ -104,11 +104,11 @@ FT_BEGIN_HEADER
 
   /*************************************************************************
    *
-   * If FT_LOGGING is enabled, tracing messages are sent to dlg's API.
-   * If FT_LOGGING is disabled, tracing messages are sent to `FT_Message`
-   * (defined in ftdebug.c).
+   * If FT_DEBUG_LOGGING is enabled, tracing messages are sent to dlg's API.
+   * If FT_DEBUG_LOGGING is disabled, tracing messages are sent to
+   * `FT_Message` (defined in ftdebug.c).
    */
-#ifdef FT_LOGGING
+#ifdef FT_DEBUG_LOGGING
 
   /* we need two macros to convert the names of `FT_COMPONENT` to a string */
 #define FT_LOGGING_TAG( x )   FT_LOGGING_TAG_( x )
@@ -132,7 +132,7 @@ FT_BEGIN_HEADER
             ft_remove_tag( dlg_tag );                                      \
           } while( 0 )
 
-#else /* !FT_LOGGING */
+#else /* !FT_DEBUG_LOGGING */
 
 #define FT_LOG( level, varformat )                                         \
           do                                                               \
@@ -141,7 +141,7 @@ FT_BEGIN_HEADER
               FT_Message varformat;                                        \
           } while ( 0 )
 
-#endif /* !FT_LOGGING */
+#endif /* !FT_DEBUG_LOGGING */
 
 
 #ifdef FT_DEBUG_LEVEL_TRACE
@@ -259,14 +259,14 @@ FT_BEGIN_HEADER
 
 #ifdef FT_DEBUG_LEVEL_ERROR
 
-  /*************************************************************************
+  /**************************************************************************
    *
-   * If FT_LOGGING is enabled, error messages are sent to dlg's API.
-   * If FT_LOGGING is disabled, error messages are sent to `FT_Message`
+   * If FT_DEBUG_LOGGING is enabled, error messages are sent to dlg's API.
+   * If FT_DEBUG_LOGGING is disabled, error messages are sent to `FT_Message`
    * (defined in ftdebug.c).
    *
    */
-#ifdef FT_LOGGING
+#ifdef FT_DEBUG_LOGGING
 
 #define FT_ERROR( varformat )                                      \
           do                                                       \
@@ -279,11 +279,11 @@ FT_BEGIN_HEADER
             ft_remove_tag( dlg_tag );                              \
           } while ( 0 )
 
-#else /* !FT_LOGGING */
+#else /* !FT_DEBUG_LOGGING */
 
 #define FT_ERROR( varformat )  FT_Message varformat
 
-#endif /* !FT_LOGGING */
+#endif /* !FT_DEBUG_LOGGING */
 
 
 #else  /* !FT_DEBUG_LEVEL_ERROR */
@@ -358,7 +358,7 @@ FT_BEGIN_HEADER
   ft_debug_init( void );
 
 
-#ifdef FT_LOGGING
+#ifdef FT_DEBUG_LOGGING
 
   /**************************************************************************
    *
@@ -388,7 +388,7 @@ FT_BEGIN_HEADER
 
   /**************************************************************************
    *
-   * If FT_LOGGING macro is enabled, FreeType needs to initialize and
+   * If FT_DEBUG_LOGGING macro is enabled, FreeType needs to initialize and
    * un-initialize `FILE*`.
    *
    * These functions are defined in `ftdebug.c`.
@@ -425,7 +425,7 @@ FT_BEGIN_HEADER
   FT_Logging_Callback( const char*  fmt,
                        ... );
 
-#endif /* FT_LOGGING */
+#endif /* FT_DEBUG_LOGGING */
 
 
 FT_END_HEADER
diff --git a/src/base/ftdebug.c b/src/base/ftdebug.c
index c8340bb..3230a02 100644
--- a/src/base/ftdebug.c
+++ b/src/base/ftdebug.c
@@ -46,7 +46,7 @@
 #include <freetype/internal/ftobjs.h>
 
 
-#ifdef FT_LOGGING
+#ifdef FT_DEBUG_LOGGING
 
   /**************************************************************************
    *
@@ -87,7 +87,7 @@
   dlg_handler            ft_default_log_handler = NULL;
   FT_Custom_Log_Handler  custom_output_handler  = NULL;
 
-#endif /* FT_LOGGING*/
+#endif /* FT_DEBUG_LOGGING*/
 
 
 #ifdef FT_DEBUG_LEVEL_ERROR
@@ -242,7 +242,7 @@
     const char*  ft2_debug = NULL;
 
 
-#ifdef FT_LOGGING
+#ifdef FT_DEBUG_LOGGING
     if ( ft_custom_trace_level != NULL )
       ft2_debug = ft_custom_trace_level;
     else
@@ -263,7 +263,7 @@
         if ( *p == ' ' || *p == '\t' || *p == ',' || *p == ';' || *p == '=' )
           continue;
 
-#ifdef FT_LOGGING
+#ifdef FT_DEBUG_LOGGING
 
         /* check extra arguments for logging */
         if ( *p == '-' )
@@ -304,7 +304,7 @@
           }
         }
 
-#endif /* FT_LOGGING */
+#endif /* FT_DEBUG_LOGGING */
 
         /* read toggle name, followed by ':' */
         q = p;
@@ -410,7 +410,7 @@
 #endif /* !FT_DEBUG_LEVEL_TRACE */
 
 
-#ifdef FT_LOGGING
+#ifdef FT_DEBUG_LOGGING
 
   /**************************************************************************
    *
@@ -608,7 +608,7 @@
     va_end( ap );
   }
 
-#endif /* FT_LOGGING */
+#endif /* FT_DEBUG_LOGGING */
 
 
 /* END */
diff --git a/src/base/ftinit.c b/src/base/ftinit.c
index 7f9b65a..5dededd 100644
--- a/src/base/ftinit.c
+++ b/src/base/ftinit.c
@@ -202,7 +202,7 @@
     FT_Memory  memory;
 
 
-#ifdef FT_LOGGING
+#ifdef FT_DEBUG_LOGGING
     ft_logging_init();
 #endif
 
@@ -252,7 +252,7 @@
     /* discard memory manager */
     FT_Done_Memory( memory );
 
-#ifdef FT_LOGGING
+#ifdef FT_DEBUG_LOGGING
     ft_logging_deinit();
 #endif
 
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 5b66848..83351ad 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -5292,12 +5292,12 @@
     if ( !memory || !alibrary )
       return FT_THROW( Invalid_Argument );
 
-#ifndef FT_LOGGING
+#ifndef FT_DEBUG_LOGGING
 #ifdef FT_DEBUG_LEVEL_ERROR
     /* init debugging support */
     ft_debug_init();
 #endif /* FT_DEBUG_LEVEL_ERROR */
-#endif /* !FT_LOGGING */
+#endif /* !FT_DEBUG_LOGGING */
 
     /* first of all, allocate the library object */
     if ( FT_NEW( library ) )
diff --git a/src/dlg/dlgwrap.c b/src/dlg/dlgwrap.c
index ea034fb..1a5d274 100644
--- a/src/dlg/dlgwrap.c
+++ b/src/dlg/dlgwrap.c
@@ -24,7 +24,7 @@
 #include <freetype/freetype.h>
 
 
-#ifdef FT_LOGGING
+#ifdef FT_DEBUG_LOGGING
 #include "dlg.c"
 #else
   /* ANSI C doesn't like empty source files */