From 01d9ce038650daea68738b4ee5c1114e31853b85 Mon Sep 17 00:00:00 2001
From: David Turner <david@freetype.org>
Date: Wed, 6 Mar 2002 12:39:12 +0000
Subject: [PATCH]         * src/pshinter/pshalgo2.c: changed 'print_zone' to
 'psh2_print_zone'         * src/pshinter/pshalgo1.c: changed 'print_zone' to
 'psh1_print_zone'

---
 ChangeLog               |  4 ++++
 src/pshinter/pshalgo1.c | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 81308c2b7..99cc46320 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
         fixed another bug related to the ascender/descender/text height of
         Postscript fonts. Damn, this should have been fixed on 2002-03-04 !
 
+        * src/pshinter/pshalgo2.c: changed 'print_zone' to 'psh2_print_zone'
+        * src/pshinter/pshalgo1.c: changed 'print_zone' to 'psh1_print_zone'
+
+
 2002-03-06  Werner Lemberg  <wl@gnu.org>
 
 	* src/pshinter/pshglob.h (PSH_DimensionRec): s/std/stdw/.
diff --git a/src/pshinter/pshalgo1.c b/src/pshinter/pshalgo1.c
index a46f6c326..438e99c6a 100644
--- a/src/pshinter/pshalgo1.c
+++ b/src/pshinter/pshalgo1.c
@@ -498,7 +498,7 @@
 #include <stdio.h>
 
   static void
-  print_zone( PSH1_Zone  zone )
+  psh1_print_zone( PSH1_Zone  zone )
   {
     printf( "zone [scale,delta,min,max] = [%.3f,%.3f,%d,%d]\n",
              zone->scale / 65536.0,
@@ -508,7 +508,7 @@
   }
 
 #else
-#define print_zone( x )  do { } while ( 0 )
+#define psh1_print_zone( x )  do { } while ( 0 )
 #endif
 
   /* setup interpolation zones once the hints have been grid-fitted */
@@ -549,7 +549,7 @@
     zone->min   = PSH1_ZONE_MIN;
     zone->max   = hint->org_pos;
 
-    print_zone( zone );
+    psh1_print_zone( zone );
 
     zone++;
 
@@ -570,7 +570,7 @@
         zone->max   = hint->org_pos + hint->org_len;
         zone->delta = hint->cur_pos - FT_MulFix( zone->min, scale2 );
 
-        print_zone( zone );
+        psh1_print_zone( zone );
 
         zone++;
       }
@@ -593,7 +593,7 @@
       zone->delta = hint->cur_pos + hint->cur_len -
                     FT_MulFix( zone->min, scale2 );
 
-      print_zone( zone );
+      psh1_print_zone( zone );
 
       zone++;
 
@@ -607,7 +607,7 @@
     zone->delta = hint->cur_pos + hint->cur_len -
                   FT_MulFix( zone->min, scale );
 
-    print_zone( zone );
+    psh1_print_zone( zone );
 
     zone++;