diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2011-02-13 18:52:52 +0000 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2011-10-05 17:08:21 +0100 |
| commit | f00675ac0773e1c5bcba541806b236b42eb3c3a7 (patch) | |
| tree | 10b245f3e2ce3a76786e39726437e1c5d54c08cf | |
| parent | 36fa2c6276ba258b7455a6221998d17298242a15 (diff) | |
Don't bother reporting XORG_VERSION_CURRENT
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.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
| -rw-r--r-- | hw/xwin/winerror.c | 4 | ||||
| -rw-r--r-- | hw/xwin/winprocarg.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/xwin/winerror.c b/hw/xwin/winerror.c index 72c7a1b75..add03d869 100644 --- a/hw/xwin/winerror.c +++ b/hw/xwin/winerror.c @@ -160,7 +160,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" \ @@ -169,7 +169,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/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c index 6935b0216..7004867d0 100644 --- a/hw/xwin/winprocarg.c +++ b/hw/xwin/winprocarg.c @@ -1320,7 +1320,7 @@ winLogVersionInfo (void) ErrorF ("Welcome to the XWin X Server\n"); ErrorF ("Vendor: %s\n", XVENDORNAME); - ErrorF ("Release: %d.%d.%d.%d (%d)\n", XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP, XORG_VERSION_CURRENT); + ErrorF ("Release: %d.%d.%d.%d\n", XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP); winOS(); if (strlen(BUILDERSTRING)) ErrorF ("%s\n", BUILDERSTRING); ErrorF("\n"); |