summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Mainz <roland.mainz@nrubsig.org>2004-12-17 02:01:21 +0000
committerRoland Mainz <roland.mainz@nrubsig.org>2004-12-17 02:01:21 +0000
commit7ab636dcf0b06bbeb1d2227159edad3626ad7e71 (patch)
treeb3a0f4f24ca085eb0b3162f92a3292de75706ac7
parent73fe0ac04ec814590f9e5860659b6cacbf5cb16b (diff)
//bugs.freedesktop.org/show_bug.cgi?id=2086) attachment #1556XORG-6_8_1_901
(https://bugs.freedesktop.org/attachment.cgi?id=1556): Fix problems with printing the release candidate version number for point releases. Patch by Kevin E. Martin <kem@freedesktop.org>
-rw-r--r--hw/xfree86/common/xf86Init.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index d9d55a4fe..20249102a 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1764,8 +1764,22 @@ xf86PrintBanner()
#endif
#if XORG_VERSION_SNAP >= 900
- ErrorF(" (%d.%d.0 RC %d)", XORG_VERSION_MAJOR, XORG_VERSION_MINOR + 1,
- XORG_VERSION_SNAP - 900);
+ /* When the patch number is 99, that signifies that the we are making
+ * a release candidate for a major version; however, if the patch
+ * number is < 99, then we are making a release candidate for the next
+ * point release.
+ */
+ if (XORG_VERSION_PATCH == 99)
+ ErrorF(" (%d.%d.0 RC %d)",
+ XORG_VERSION_MAJOR,
+ XORG_VERSION_MINOR + 1,
+ XORG_VERSION_SNAP - 900);
+ else
+ ErrorF(" (%d.%d.%d RC %d)",
+ XORG_VERSION_MAJOR,
+ XORG_VERSION_MINOR,
+ XORG_VERSION_PATCH + 1,
+ XORG_VERSION_SNAP - 900);
#endif
#ifdef XORG_CUSTOM_VERSION