diff options
| author | gildea <empty> | 1994-02-07 16:06:59 +0000 |
|---|---|---|
| committer | gildea <empty> | 1994-02-07 16:06:59 +0000 |
| commit | eadf3150112ed0a621999783aa90de6732228339 (patch) | |
| tree | 7668d3d9c45fc9eb68d3674be4856b6200168a79 /xc/lib | |
| parent | 0fcd0e1c12661ebd82a3788f6d5df0d0c32e7b9c (diff) | |
bitmaputil.c -> utilbitmap.c to avoid confict with bitmap/bitmaputil.c
XBUG #6379.
Diffstat (limited to 'xc/lib')
| -rw-r--r-- | xc/lib/font/util/Imakefile | 6 | ||||
| -rw-r--r-- | xc/lib/font/util/utilbitmap.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/xc/lib/font/util/Imakefile b/xc/lib/font/util/Imakefile index 5b325361d..5da046433 100644 --- a/xc/lib/font/util/Imakefile +++ b/xc/lib/font/util/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XConsortium: Imakefile,v 1.9 92/05/15 11:15:42 gildea Exp $ +XCOMM $XConsortium: Imakefile,v 1.10 93/09/04 16:45:33 rws Exp $ #include <Server.tmpl> INCLUDES = -I$(FONTINCSRC) -I../include @@ -6,10 +6,10 @@ XCOMM $XConsortium: Imakefile,v 1.9 92/05/15 11:15:42 gildea Exp $ #ifdef FontFormatDefines FORMAT_DEFS = FontFormatDefines #endif - SRCS = bitmaputil.c fontnames.c fontutil.c fontxlfd.c format.c \ + SRCS = utilbitmap.c fontnames.c fontutil.c fontxlfd.c format.c \ fontaccel.c atom.c miscutil.c private.c patcache.c - OBJS = bitmaputil.o fontnames.o fontutil.o fontxlfd.o format.o \ + OBJS = utilbitmap.o fontnames.o fontutil.o fontxlfd.o format.o \ fontaccel.o atom.o miscutil.o private.o patcache.o SubdirLibraryRule($(OBJS)) diff --git a/xc/lib/font/util/utilbitmap.c b/xc/lib/font/util/utilbitmap.c index e5d4b45c6..c8de26875 100644 --- a/xc/lib/font/util/utilbitmap.c +++ b/xc/lib/font/util/utilbitmap.c @@ -1,5 +1,5 @@ /* - * $XConsortium: bitmaputil.c,v 1.2 91/02/22 17:58:11 keith Exp $ + * $XConsortium: bitmaputil.c,v 1.1 91/05/10 16:51:48 keith Exp $ * * Copyright 1990 Massachusetts Institute of Technology * |