From f335bac8a38e816c4243474d7c7d186638d3aab4 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 14 Oct 2005 21:21:51 +0000
Subject: [PATCH] Reverted the LIBCURL_VERSION_NUM change from October 6. As
Dave Dribin reported, the define is used by the configure script and is
assumed to use the 0xYYXXZZ format. This made "curl-config --vernum" fail in
the 7.15.0 release version.
---
CHANGES | 6 ++++++
RELEASE-NOTES | 4 ++--
include/curl/curlver.h | 4 +---
maketgz | 1 +
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/CHANGES b/CHANGES
index 8d2017e5c4..ccfac04a97 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,12 @@
+Daniel (14 October 2005)
+- Reverted the LIBCURL_VERSION_NUM change from October 6. As Dave Dribin
+ reported, the define is used by the configure script and is assumed to use
+ the 0xYYXXZZ format. This made "curl-config --vernum" fail in the 7.15.0
+ release version.
+
Version 7.15.0 (13 October 2005)
Daniel (12 October 2005)
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c458a948fe..ddfc40035a 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -15,7 +15,7 @@ This release includes the following changes:
This release includes the following bugfixes:
- o
+ o curl-config --vernum fixed
Other curl-related news since the previous public release:
@@ -24,6 +24,6 @@ Other curl-related news since the previous public release:
This release would not have looked like this without help, code, reports and
advice from friends like these:
- o
+ Dave Dribin
Thanks! (and sorry if I forgot to mention someone)
diff --git a/include/curl/curlver.h b/include/curl/curlver.h
index 0cb6c2337e..7f94670f44 100644
--- a/include/curl/curlver.h
+++ b/include/curl/curlver.h
@@ -51,8 +51,6 @@
and it is always a greater number in a more recent release. It makes
comparisons with greater than and less than work.
*/
-#define LIBCURL_VERSION_NUM ((LIBCURL_VERSION_MAJOR << 16) | \
- (LIBCURL_VERSION_MINOR << 8) | \
- LIBCURL_VERSION_PATCH)
+#define LIBCURL_VERSION_NUM 0x070f01
#endif /* __CURL_CURLVER_H */
diff --git a/maketgz b/maketgz
index 91ac4c4443..4941f88334 100755
--- a/maketgz
+++ b/maketgz
@@ -25,6 +25,7 @@ CHEADER=src/version.h
# Replace version number in header file:
sed -e 's/^#define LIBCURL_VERSION .*/#define LIBCURL_VERSION "'$libversion'"/g' \
+ -e 's/^#define LIBCURL_VERSION_NUM .*/#define LIBCURL_VERSION_NUM 0x'$numeric'/g' \
-e 's/^#define LIBCURL_VERSION_MAJOR .*/#define LIBCURL_VERSION_MAJOR '$major'/g' \
-e 's/^#define LIBCURL_VERSION_MINOR .*/#define LIBCURL_VERSION_MINOR '$minor'/g' \
-e 's/^#define LIBCURL_VERSION_PATCH .*/#define LIBCURL_VERSION_PATCH '$patch'/g' \
--
GitLab