frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/xwin: 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>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
Jon TURNEY 2011-02-13 18:52:52 +00:00
parent d5977e5bd2
commit 9fe9c5f868
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xwin/winerror.c
View File

@ -111,7 +111,7 @@ winMessageBoxF(const char *pszError, UINT uType, ...)
#define MESSAGEBOXF \ #define MESSAGEBOXF \
"%s\n" \ "%s\n" \
"Vendor: %s\n" \ "Vendor: %s\n" \
"Release: %d.%d.%d.%d (%d)\n" \ "Release: %d.%d.%d.%d\n" \
"Contact: %s\n" \ "Contact: %s\n" \
"%s\n\n" \ "%s\n\n" \
"XWin was started with the following command-line:\n\n" \ "XWin was started with the following command-line:\n\n" \
@ -120,7 +120,7 @@ winMessageBoxF(const char *pszError, UINT uType, ...)
size = asprintf(&pszMsgBox, MESSAGEBOXF, size = asprintf(&pszMsgBox, MESSAGEBOXF,
pszErrorF, XVENDORNAME, pszErrorF, XVENDORNAME,
XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH,
XORG_VERSION_SNAP, XORG_VERSION_CURRENT, XORG_VERSION_SNAP,
BUILDERADDR, BUILDERSTRING, g_pszCommandLine); BUILDERADDR, BUILDERSTRING, g_pszCommandLine);
if (size == -1) { if (size == -1) {

5
hw/xwin/winprocarg.c
View File

@ -1158,9 +1158,8 @@ winLogVersionInfo(void)
ErrorF("Welcome to the XWin X Server\n"); ErrorF("Welcome to the XWin X Server\n");
ErrorF("Vendor: %s\n", XVENDORNAME); ErrorF("Vendor: %s\n", XVENDORNAME);
ErrorF("Release: %d.%d.%d.%d (%d)\n", XORG_VERSION_MAJOR, ErrorF("Release: %d.%d.%d.%d\n", XORG_VERSION_MAJOR,
XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP);
XORG_VERSION_CURRENT);
ErrorF("%s\n\n", BUILDERSTRING); ErrorF("%s\n\n", BUILDERSTRING);
ErrorF("Contact: %s\n", BUILDERADDR); ErrorF("Contact: %s\n", BUILDERADDR);
} }