From 9aa6beb6b7e6272b05a03e0a4fd34eb8ad21bf47 Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Mon, 16 Aug 2004 02:07:53 +0000 Subject: Fix banner to print out proper version information. --- hw/xfree86/common/xf86Init.c | 4 ++++ hw/xfree86/common/xorgVersion.h | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 9f90c08d8..07e3cc3af 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -1764,6 +1764,10 @@ xf86PrintBanner() "latest version in the " XVENDORNAME " \"monolithic tree\" CVS\n" "repository hosted at http://www.freedesktop.org/Software/xorg/"); #endif + ErrorF("\nX Window System Version %d.%d.%d", + XORG_VERSION_MAJOR, + XORG_VERSION_MINOR, + XORG_VERSION_PATCH); #if XORG_VERSION_SNAP > 0 ErrorF(".%d", XORG_VERSION_SNAP); #endif diff --git a/hw/xfree86/common/xorgVersion.h b/hw/xfree86/common/xorgVersion.h index f40a452e6..e89cc39c1 100644 --- a/hw/xfree86/common/xorgVersion.h +++ b/hw/xfree86/common/xorgVersion.h @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xorgVersion.h,v 1.2 2004/04/23 19:20:02 eich Exp $ */ /* * Copyright (c) 2004, X.Org Foundation @@ -45,7 +45,7 @@ # define XORG_VERSION_MAJOR XORG_GET_MAJOR_VERSION(XORG_VERSION_CURRENT) # define XORG_VERSION_MINOR XORG_GET_MINOR_VERSION(XORG_VERSION_CURRENT) # define XORG_VERSION_PATCH XORG_GET_PATCH_VERSION(XORG_VERSION_CURRENT) -# define XORG_VERSION_SNAP XORG_GET_PATCH_VERSION(XORG_VERSION_CURRENT) +# define XORG_VERSION_SNAP XORG_GET_SNAP_VERSION(XORG_VERSION_CURRENT) #endif -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xorgVersion.h,v 1.2 2004/04/23 19:20:02 eich Exp $ */ -- cgit v1.2.3