[Xorg-commit] xc/lib/font/Type1 t1funcs.c,1.1.4.2,1.1.4.3 t1malloc.c,1.1.4.1,1.1.4.2

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/lib/font/Type1
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/lib/font/Type1

Modified Files:
      Tag: XORG-CURRENT
	t1funcs.c t1malloc.c 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: t1funcs.c
===================================================================
RCS file: /cvs/xorg/xc/lib/font/Type1/t1funcs.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/t1funcs.c	26 Nov 2003 22:48:40 -0000	1.1.4.2
+++ b/t1funcs.c	23 Feb 2004 21:34:42 -0000	1.1.4.3
@@ -71,7 +71,7 @@
  * The Original Software is CID font code that was developed by Silicon
  * Graphics, Inc.
  */
-/* $XFree86: xc/lib/font/Type1/t1funcs.c,v 3.33 2003/07/19 13:16:40 tsi Exp $ */
+/* $XFree86: xc/lib/font/Type1/t1funcs.c,v 3.34 2004/02/02 03:55:27 dawes Exp $ */
 
 /*
 
@@ -123,10 +123,14 @@
 #else
 #include "Xmd.h"
 #include "Xdefs.h"
-#include "xf86_ansic.h"
 #endif
 
 #include "os.h"
+
+#ifdef FONTMODULE
+#include "xf86_ansic.h"
+#endif
+
 #include "fntfilst.h"
 #include "fontutil.h"
 #include "FSproto.h"

Index: t1malloc.c
===================================================================
RCS file: /cvs/xorg/xc/lib/font/Type1/t1malloc.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/t1malloc.c	17 Nov 2003 19:03:42 -0000	1.1.4.1
+++ b/t1malloc.c	23 Feb 2004 21:34:42 -0000	1.1.4.2
@@ -26,7 +26,7 @@
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/lib/font/Type1/t1malloc.c,v 1.11 2002/02/18 20:51:57 herrb Exp $ */
+/* $XFree86: xc/lib/font/Type1/t1malloc.c,v 1.12 2004/01/23 03:55:25 dawes Exp $ */
  /* MALLOC   CWEB         V0004 LOTS                                 */
 /*
 :h1.MALLOC - Fast Memory Allocation
@@ -258,13 +258,13 @@
         if (++uncombined > MAXUNCOMBINED) {
                 combine();
                 if (mallocdebug) {
-                        printf("xiFree(%p) with combine, ", addr);
+                        printf("xiFree(%p) with combine, ", (void *)addr);
                         dumpchain();
                 }
         }
         else {
                 if (mallocdebug) {
-                        printf("xiFree(%p), ", addr);
+                        printf("xiFree(%p), ", (void *)addr);
                         dumpchain();
                 }
         }
@@ -470,7 +470,8 @@
                         unhook(p);
                         uncombined--;
                         if (mallocdebug) {
-                               printf("fast xiMalloc(%ld) = %p, ", size, p);
+                               printf("fast xiMalloc(%ld) = %p, ", size,
+					(void *)p);
                                dumpchain();
                         }
                         AvailableWords += size;  /* decreases AvailableWords */
@@ -527,7 +528,7 @@
         area[size - 1] = area[0] = - size;
  
         if (mallocdebug) {
-                printf("slow xiMalloc(%ld) @ %p, ", size, area);
+                printf("slow xiMalloc(%ld) @ %p, ", size, (void *)area);
                 dumpchain();
         }
         whocalledme(area, &Size);
@@ -646,7 +647,7 @@
                 if (--i < 0)
                         Abort("too many uncombined areas");
                 size = p->size;
-                printf(". . . area @ %p, size = %ld\n", p, -size);
+                printf(". . . area @ %p, size = %ld\n", (void *)p, -size);
                 if (size >= 0 || size != ((int *) p)[-1 - size])
                         Abort("dumpchain: bad size");
                 if (p->back != back)
@@ -656,7 +657,7 @@
         printf("DUMPING COMBINED FREE LIST:\n");
         for (; p != &lastfree; p = p->fore)  {
                 size = p->size;
-                printf(". . . area @ %p, size = %ld\n", p, size);
+                printf(". . . area @ %p, size = %ld\n", (void *)p, size);
                 if (size <= 0 || size != ((int *) p)[size - 1])
                         Abort("dumpchain: bad size");
                 if (p->back != back)