- Tom Donovan fixed the CURL_FORMAT_* defines when building with cmake.

diff --git a/CHANGES b/CHANGES
index feb11cbd467ee8b63e112afbf6e2b9fff81acdc6..9cdd0a6c135f73dbb629b14fa7ec464103d4f643 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@
 
                                   Changelog
 
+Daniel Stenberg (13 Feb 2010)
+- Tom Donovan fixed the CURL_FORMAT_* defines when building with cmake.
+
 Daniel Stenberg (12 Feb 2010)
 - Jack Zhang reported a problem with SMTP: we wrongly used multiple addresses
   in the same RCPT TO line, when they should be sent in separate single

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6a8458e23272149071d819cb0e7af8fb42e322da..270241a413e051fbf4478437862c391abd4c6d38 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -15,6 +15,7 @@ This release includes the following bugfixes:
 
  o VMS builder bad behavior when used in a batch job
  o multiple recepients with SMTP
+ o fixed the CURL_FORMAT_* defines when building with cmake
 
 This release includes the following known bugs:
 
@@ -23,6 +24,6 @@ This release includes the following known bugs:
 This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
- Steven M. Schweda, Yang Tse, Jack Zhang
+ Steven M. Schweda, Yang Tse, Jack Zhang, Tom Donovan
 
         Thanks! (and sorry if I forgot to mention someone)

diff --git a/include/curl/curlbuild.h.cmake b/include/curl/curlbuild.h.cmake
index afa1316c0e28a38a9dff5c7591d87834edfacb37..72435f0d9117f5b2a6f65eb53ef9decea0b2231f 100644 (file)
--- a/include/curl/curlbuild.h.cmake
+++ b/include/curl/curlbuild.h.cmake
@@ -157,13 +157,13 @@ typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
 typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
 
 /* curl_off_t formatting string directive without "%" conversion specifier. */
-#cmakedefine CURL_FORMAT_CURL_OFF_T ${CURL_FORMAT_CURL_OFF_T}
+#cmakedefine CURL_FORMAT_CURL_OFF_T "${CURL_FORMAT_CURL_OFF_T}"
 
 /* unsigned curl_off_t formatting string without "%" conversion specifier. */
-#cmakedefine CURL_FORMAT_CURL_OFF_TU ${CURL_FORMAT_CURL_OFF_TU}
+#cmakedefine CURL_FORMAT_CURL_OFF_TU "${CURL_FORMAT_CURL_OFF_TU}"
 
 /* curl_off_t formatting string directive with "%" conversion specifier. */
-#cmakedefine CURL_FORMAT_OFF_T ${CURL_FORMAT_OFF_T}
+#cmakedefine CURL_FORMAT_OFF_T "${CURL_FORMAT_OFF_T}"
 
 /* The size of `curl_off_t', as computed by sizeof. */
 #cmakedefine CURL_SIZEOF_CURL_OFF_T ${CURL_SIZEOF_CURL_OFF_T}