xserver: Branch 'xorg-server-1.2-apple'

[Jeremy Huddleston]

 dix/dixfonts.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a842d8a85d77a3b8657f53224bf7791c3abfe22a
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date:   Tue Nov 20 16:02:02 2007 -0800

    Dix: Re-ebable ErrorF reporting of incorrect refcount in FreeFontPath
    (cherry picked from commit c362d829a6829367621faedc9ad7e10549ab64dc)

diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index e085bd0..f10011e 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -1632,9 +1632,9 @@ FreeFontPath(FontPathElementPtr *list, int n, Bool force)
 		    found++;
 	    }
 	    if (list[i]->refcount != found) {
-	      /*		ErrorF("FreeFontPath: FPE \"%.*s\" refcount is %d, should be %d; fixing.\n",
+		ErrorF("FreeFontPath: FPE \"%.*s\" refcount is %d, should be %d; fixing.\n",
 		       list[i]->name_length, list[i]->name,
-		       list[i]->refcount, found); */
+		       list[i]->refcount, found);
 		list[i]->refcount = found; /* ensure it will get freed */
 	    }
 	}