From 7fb87aa305856f07d7a57b3296ade04b1f012f1a Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Wed, 3 Mar 2004 12:11:43 +0000
Subject: Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004

---
 src/encparse.c | 6 +++---
 src/fontenc.c  | 2 +-
 src/fontencI.h | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/encparse.c b/src/encparse.c
index 2e24475..acf17f2 100644
--- a/src/encparse.c
+++ b/src/encparse.c
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-/* $XFree86: xc/lib/font/fontfile/encparse.c,v 1.20 2004/02/11 21:11:19 dawes Exp $ */
+/* $XFree86: xc/lib/font/fontfile/encparse.c,v 1.20tsi Exp $ */
 
 /* Parser for encoding files */
 
@@ -854,8 +854,8 @@ FontEncReallyReallyLoad(const char *charset,
 
     encoding = NULL;
     if (!format[0]) {
-	sprintf(format, "%%%ds %%%d[^\n]\n", sizeof(encoding_name) - 1,
-		sizeof(file_name) - 1);
+	sprintf(format, "%%%ds %%%d[^\n]\n", (int)sizeof(encoding_name) - 1,
+		(int)sizeof(file_name) - 1);
     }
     for(;;) {
         count = fscanf(file, format, encoding_name, file_name);
diff --git a/src/fontenc.c b/src/fontenc.c
index 7e81553..fb5db7e 100644
--- a/src/fontenc.c
+++ b/src/fontenc.c
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-/* $XFree86: xc/lib/font/fontfile/fontenc.c,v 1.16 2003/12/19 02:05:38 dawes Exp $ */
+/* $XFree86: xc/lib/font/fontfile/fontenc.c,v 1.15 2003/02/20 03:25:19 dawes Exp $ */
 
 /* Backend-independent encoding code */
 
diff --git a/src/fontencI.h b/src/fontencI.h
index b9545e4..bd35a1f 100644
--- a/src/fontencI.h
+++ b/src/fontencI.h
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-/* $XFree86: xc/lib/font/fontfile/fontencI.h,v 1.4 2001/08/13 21:46:47 dawes Exp $ */
+/* $XFree86: xc/lib/font/fontfile/fontencI.h,v 1.3 1999/04/25 10:01:43 dawes Exp $ */
 
 /* Private types and functions for the encoding code. */
 /* Used by the files `fontenc.h' and `encparse.h' */
-- 
cgit v1.2.3