From d5627ab9673bc0d37bec62874c0b41dee39d85f4 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 14 Feb 2011 16:59:43 +0000 Subject: Don't bother reporting XORG_VERSION_CURRENT, when we also report the version number broken down into it's components XORG_VERSION_MAJOR, XORG_VERSION_MINOR, etc. as well. --- xorg-server/hw/xwin/winerror.c | 4 ++-- xorg-server/hw/xwin/winprocarg.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xorg-server/hw/xwin/winerror.c b/xorg-server/hw/xwin/winerror.c index 25d05339b..47e1bd86f 100644 --- a/xorg-server/hw/xwin/winerror.c +++ b/xorg-server/hw/xwin/winerror.c @@ -135,7 +135,7 @@ winMessageBoxF (const char *pszError, UINT uType, ...) #define MESSAGEBOXF \ "%s\n" \ "Vendor: %s\n" \ - "Release: %d.%d.%d.%d (%d)\n" \ + "Release: %d.%d.%d.%d\n" \ "Contact: %s\n" \ "%s\n\n" \ "XWin was started with the following command-line:\n\n" \ @@ -144,7 +144,7 @@ winMessageBoxF (const char *pszError, UINT uType, ...) size = asprintf (&pszMsgBox, MESSAGEBOXF, pszErrorF, XVENDORNAME, XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, - XORG_VERSION_SNAP, XORG_VERSION_CURRENT, + XORG_VERSION_SNAP, BUILDERADDR, BUILDERSTRING, g_pszCommandLine); diff --git a/xorg-server/hw/xwin/winprocarg.c b/xorg-server/hw/xwin/winprocarg.c index 96db9fec2..fef3edd4f 100644 --- a/xorg-server/hw/xwin/winprocarg.c +++ b/xorg-server/hw/xwin/winprocarg.c @@ -1212,7 +1212,7 @@ winLogVersionInfo (void) winDebug ("Welcome to the VcXsrv X Server\n"); winDebug ("Vendor: %s\n", XVENDORNAME); - winDebug ("Release: %d.%d.%d.%d (%d)\n\n", XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP, XORG_VERSION_CURRENT); + winDebug ("Release: %d.%d.%d.%d\n\n", XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP); winDebug ("%s\n\n", BUILDERSTRING); winDebug ("Contact: %s\n\n", BUILDERADDR); #endif -- cgit v1.2.3