Merged revisions 7072 via svnmerge from

https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_98_5_maint

........
  r7072 | mdboom | 2009-04-30 09:27:04 -0400 (Thu, 30 Apr 2009) | 2 lines
  
  Fix solaris builds where "putchar" is a macro.
........

svn path=/trunk/matplotlib/; revision=7073

Author: mdboom

ttconv/pprdrv.h

@@ -40,7 +40,7 @@ class TTStreamWriter {
   virtual void write(const char*) = 0;
 
   virtual void printf(const char* format, ...);
-  virtual void putchar(int val);
+  virtual void put_char(int val);
   virtual void puts(const char* a);
   virtual void putline(const char* a);
 };

ttconv/pprdrv_tt.cpp

@@ -495,20 +495,20 @@ void sfnts_pputBYTE(TTStreamWriter& stream, BYTE n)
 
     if(!in_string)
     	{
-	stream.putchar('<');
+	stream.put_char('<');
     	string_len=0;
     	line_len++;
     	in_string=TRUE;
     	}
 
-    stream.putchar( hexdigits[ n / 16 ] );
-    stream.putchar( hexdigits[ n % 16 ] );
+    stream.put_char( hexdigits[ n / 16 ] );
+    stream.put_char( hexdigits[ n % 16 ] );
     string_len++;
     line_len+=2;
 
     if(line_len > 70)
    	{
-   	stream.putchar('\n');
+   	stream.put_char('\n');
    	line_len=0;
    	}
 
@@ -561,7 +561,7 @@ void sfnts_end_string(TTStreamWriter& stream)
 	#endif
 
 	sfnts_pputBYTE(stream, 0);	/* extra byte for pre-2013 compatibility */
-	stream.putchar('>');
+	stream.put_char('>');
 	line_len++;
     	}
     in_string=FALSE;
@@ -968,7 +968,7 @@ void ttfont_trailer(TTStreamWriter& stream, struct TTFONT *font)
     /* a BuildGlyph and BuildChar proceedures. */
     if( font->target_type == PS_TYPE_3 )
     	{
-	stream.putchar('\n');
+	stream.put_char('\n');
 
 	stream.putline("/BuildGlyph");
 	stream.putline(" {exch begin");		/* start font dictionary */
@@ -977,7 +977,7 @@ void ttfont_trailer(TTStreamWriter& stream, struct TTFONT *font)
 	stream.putline(" true 3 1 roll get exec");
 	stream.putline(" end}_d");
 
-	stream.putchar('\n');
+	stream.put_char('\n');
 
 	/* This proceedure is for compatiblity with */
 	/* level 1 interpreters. */
@@ -986,7 +986,7 @@ void ttfont_trailer(TTStreamWriter& stream, struct TTFONT *font)
 	stream.putline(" 1 index /BuildGlyph get exec");
 	stream.putline("}_d");
 
-	stream.putchar('\n');
+	stream.put_char('\n');
     	}
 
     /* If we are generating a type 42 font, we need to check to see */
@@ -998,7 +998,7 @@ void ttfont_trailer(TTStreamWriter& stream, struct TTFONT *font)
     /* setup instructions and part of BuildGlyph came from. */
     else if( font->target_type == PS_TYPE_42 )
     	{
-	stream.putchar('\n');
+	stream.put_char('\n');
 
 	/* If we have no "resourcestatus" command, or FontType 42 */
 	/* is unknown, leave "true" on the stack. */
@@ -1079,7 +1079,7 @@ void ttfont_trailer(TTStreamWriter& stream, struct TTFONT *font)
 	/* if the printer has no built-in TrueType */
 	/* rasterizer. */
 	stream.putline("}if");
-	stream.putchar('\n');
+	stream.put_char('\n');
     	} /* end of if Type 42 not understood. */
 
     stream.putline("FontName currentdict end definefont pop");

ttconv/pprdrv_tt2.cpp

@@ -104,7 +104,7 @@ void GlyphToType3::stack(TTStreamWriter& stream, int new_elem)
 	{				/* have a log of points. */
 	if(stack_depth == 0)
 	    {
-    	    stream.putchar('{');
+    	    stream.put_char('{');
     	    stack_depth=1;
     	    }
 

ttconv/ttutil.cpp

@@ -52,7 +52,7 @@ void TTStreamWriter::printf(const char* format, ...)
   va_end(arg_list);
 }
 
-void TTStreamWriter::putchar(int val)
+void TTStreamWriter::put_char(int val)
 {
   char c[2];
   c[0] = (char)val;