From 7872e2ca97eb68973cddf7abe12e98df7cea9e4d Mon Sep 17 00:00:00 2001 From: Kaleb Keithley Date: Wed, 26 Nov 2003 22:49:13 +0000 Subject: merge latest (4.3.99.16) from XFree86 (vendor) branch --- xstdcmap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xstdcmap.c b/xstdcmap.c index 26c377b..1c0c53c 100644 --- a/xstdcmap.c +++ b/xstdcmap.c @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. * * * Author: Donna Converse, MIT X Consortium */ -/* $XFree86: xc/programs/xstdcmap/xstdcmap.c,v 1.8 2001/12/14 20:02:30 dawes Exp $ */ +/* $XFree86: xc/programs/xstdcmap/xstdcmap.c,v 1.9 2003/03/26 20:44:00 tsi Exp $ */ #include #include @@ -348,6 +348,9 @@ main(int argc, char *argv[]) if (help) { usage(0); Exit(0); + + /* Muffle gcc */ + return 0; } if (all) { -- cgit v1.2.3