summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:49:13 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:49:13 +0000
commit7872e2ca97eb68973cddf7abe12e98df7cea9e4d (patch)
treed6cf8e0f915018abc857a61e4c6869017c39c10b
parent0dcb401692ca9432547bf988a357088c0f3f7422 (diff)
merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE
-rw-r--r--xstdcmap.c5
1 files changed, 4 insertions, 1 deletions
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 <stdio.h>
#include <stdlib.h>
@@ -348,6 +348,9 @@ main(int argc, char *argv[])
if (help) {
usage(0);
Exit(0);
+
+ /* Muffle gcc */
+ return 0;
}
if (all) {