Merge remote-tracking branch 'origin/released'

Conflicts:
	libXfont/src/fontfile/fontfile.c
	libXfont/src/util/utilbitmap.c

4 files changed, 22 insertions, 22 deletions

diff --git a/libXfont/include/X11/fonts/bitmap.h b/libXfont/include/X11/fonts/bitmap.h
index c02342759..7309ac60a 100644
--- a/libXfont/include/X11/fonts/bitmap.h
+++ b/libXfont/include/X11/fonts/bitmap.h
@@ -74,10 +74,10 @@ typedef struct _BitmapFont {
 #define NUM_SEGMENTS(n) \
   (((n)+BITMAP_FONT_SEGMENT_SIZE-1)/BITMAP_FONT_SEGMENT_SIZE)
 
-extern int bitmapGetGlyphs ( FontPtr pFont, unsigned long count, 
-			     unsigned char *chars, FontEncoding charEncoding, 
+extern int bitmapGetGlyphs ( FontPtr pFont, unsigned long count,
+			     unsigned char *chars, FontEncoding charEncoding,
 			     unsigned long *glyphCount, CharInfoPtr *glyphs );
-extern int bitmapGetMetrics ( FontPtr pFont, unsigned long count, 
+extern int bitmapGetMetrics ( FontPtr pFont, unsigned long count,
 			      unsigned char *chars, FontEncoding charEncoding,
 			      unsigned long *glyphCount, xCharInfo **glyphs );
 
@@ -88,14 +88,14 @@ extern int bitmapComputeWeight ( FontPtr pFont );
 
 extern void BitmapRegisterFontFileFunctions ( void );
 
-extern int BitmapOpenScalable ( FontPathElementPtr fpe, FontPtr *pFont, 
+extern int BitmapOpenScalable ( FontPathElementPtr fpe, FontPtr *pFont,
 				int flags, FontEntryPtr entry, char *fileName,
-				FontScalablePtr vals, fsBitmapFormat format, 
-				fsBitmapFormatMask fmask, 
+				FontScalablePtr vals, fsBitmapFormat format,
+				fsBitmapFormatMask fmask,
 				FontPtr non_cachable_font );
-extern int BitmapGetInfoScalable ( FontPathElementPtr fpe, 
-				   FontInfoPtr pFontInfo, FontEntryPtr entry, 
-				   FontNamePtr fontName, char *fileName, 
+extern int BitmapGetInfoScalable ( FontPathElementPtr fpe,
+				   FontInfoPtr pFontInfo, FontEntryPtr entry,
+				   FontNamePtr fontName, char *fileName,
 				   FontScalablePtr vals );
 
 #endif				/* _BITMAP_H_ */
diff --git a/libXfont/include/X11/fonts/fntfil.h b/libXfont/include/X11/fonts/fntfil.h
index a32df63d7..24be79a66 100644
--- a/libXfont/include/X11/fonts/fntfil.h
+++ b/libXfont/include/X11/fonts/fntfil.h
@@ -72,12 +72,12 @@ typedef struct _FontRenderer	    *FontRendererPtr;
 #define FontAliasFile	    "fonts.alias"
 #define FontScalableFile    "fonts.scale"
 
-extern int FontFileNameCheck ( char *name );
+extern int FontFileNameCheck ( const char *name );
 extern int FontFileInitFPE ( FontPathElementPtr fpe );
 extern int FontFileResetFPE ( FontPathElementPtr fpe );
 extern int FontFileFreeFPE ( FontPathElementPtr fpe );
 extern int FontFileOpenFont ( pointer client, FontPathElementPtr fpe,
-			      Mask flags, char *name, int namelen,
+			      Mask flags, const char *name, int namelen,
 			      fsBitmapFormat format, fsBitmapFormatMask fmask,
 			      XID id, FontPtr *pFont, char **aliasName,
 			      FontPtr non_cachable_font );
@@ -87,14 +87,14 @@ extern int FontFileOpenBitmap ( FontPathElementPtr fpe, FontPtr *pFont,
 				fsBitmapFormat format,
 				fsBitmapFormatMask fmask );
 extern int FontFileListFonts ( pointer client, FontPathElementPtr fpe,
-			       char *pat, int len, int max,
+			       const char *pat, int len, int max,
 			       FontNamesPtr names );
 extern int FontFileStartListFonts ( pointer client, FontPathElementPtr fpe,
-				    char *pat, int len, int max,
+				    const char *pat, int len, int max,
 				    pointer *privatep, int mark_aliases );
 extern int FontFileStartListFontsWithInfo ( pointer client,
 					    FontPathElementPtr fpe,
-					    char *pat, int len, int max,
+					    const char *pat, int len, int max,
 					    pointer *privatep );
 extern int FontFileListNextFontWithInfo ( pointer client,
 					  FontPathElementPtr fpe,
@@ -103,7 +103,7 @@ extern int FontFileListNextFontWithInfo ( pointer client,
 					  int *numFonts, pointer private );
 extern int FontFileStartListFontsAndAliases ( pointer client,
 					      FontPathElementPtr fpe,
-					      char *pat, int len, int max,
+					      const char *pat, int len, int max,
 					      pointer *privatep );
 extern int FontFileListNextFontOrAlias ( pointer client,
 					 FontPathElementPtr fpe,
@@ -173,7 +173,7 @@ extern int FontFileMatchBitmapSource ( FontPathElementPtr fpe,
 				       fsBitmapFormatMask fmask,
 				       Bool noSpecificSize );
 
-extern int FontFileReadDirectory ( char *directory, FontDirectoryPtr *pdir );
+extern int FontFileReadDirectory ( const char *directory, FontDirectoryPtr *pdir );
 extern Bool FontFileDirectoryChanged ( FontDirectoryPtr dir );
 
 #endif /* _FONTFILE_H_ */
diff --git a/libXfont/include/X11/fonts/fontmisc.h b/libXfont/include/X11/fonts/fontmisc.h
index 73a824789..d3926a73e 100644
--- a/libXfont/include/X11/fonts/fontmisc.h
+++ b/libXfont/include/X11/fonts/fontmisc.h
@@ -91,7 +91,7 @@ RepadBitmap (
 
 extern void CopyISOLatin1Lowered(
     char * /*dest*/,
-    char * /*source*/,
+    const char * /*source*/,
     int /*length*/
 );
 
diff --git a/libXfont/include/X11/fonts/fontutil.h b/libXfont/include/X11/fonts/fontutil.h
index 71d507b1a..ed55b89e9 100644
--- a/libXfont/include/X11/fonts/fontutil.h
+++ b/libXfont/include/X11/fonts/fontutil.h
@@ -8,17 +8,17 @@ extern int CheckFSFormat(fsBitmapFormat, fsBitmapFormatMask, int *, int *,
 			 int *, int *, int *);
 extern void FontComputeInfoAccelerators(FontInfoPtr);
 
-extern void GetGlyphs ( FontPtr font, unsigned long count, 
-			unsigned char *chars, FontEncoding fontEncoding, 
+extern void GetGlyphs ( FontPtr font, unsigned long count,
+			unsigned char *chars, FontEncoding fontEncoding,
 			unsigned long *glyphcount, CharInfoPtr *glyphs );
-extern void QueryGlyphExtents ( FontPtr pFont, CharInfoPtr *charinfo, 
+extern void QueryGlyphExtents ( FontPtr pFont, CharInfoPtr *charinfo,
 				unsigned long count, ExtentInfoRec *info );
-extern Bool QueryTextExtents ( FontPtr pFont, unsigned long count, 
+extern Bool QueryTextExtents ( FontPtr pFont, unsigned long count,
 			       unsigned char *chars, ExtentInfoRec *info );
 extern Bool ParseGlyphCachingMode ( char *str );
 extern void InitGlyphCaching ( void );
 extern void SetGlyphCachingMode ( int newmode );
-extern int add_range ( fsRange *newrange, int *nranges, fsRange **range, 
+extern int add_range ( fsRange *newrange, int *nranges, fsRange **range,
 		       Bool charset_subset );
 
 #endif /* _FONTUTIL_H_ */