diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:13 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:13 +0000 |
| commit | aa7a83afdf32874b9f1a7a1df7eded54d9adf5c8 (patch) | |
| tree | 7cd7239aafa023cd6cbf98640637111e5f8f63e0 /src | |
| parent | 0b1b9f59f2513f5e2795cba34c747b0e68f4b9b1 (diff) | |
18. Merged in XFree86 code up to 4.4.0 including changes to files that had
a changed license. There was only one change which happened to be from
me (Egbert Eich).
Diffstat (limited to 'src')
| -rw-r--r-- | src/encparse.c | 6 | ||||
| -rw-r--r-- | src/fontenc.c | 4 | ||||
| -rw-r--r-- | src/fontencI.h | 2 |
3 files changed, 6 insertions, 6 deletions
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 0bf69e2..c5df4dd 100644 --- a/src/fontenc.c +++ b/src/fontenc.c @@ -20,8 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XdotOrg: 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.16 2003/12/19 02:05:38 dawes Exp $ */ +: /* $XdotOrg: 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' */ |