From: Terry Burton <tez@terryburton.co.uk>
Date: Sun, 6 Dec 2020 21:35:15 +0000 (+0000)
Subject: Move CURL_AT_LEAST_VERSION macro into header
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3884aaa2b99fdcb1c00ce2e480b69bbb621756e;p=thirdparty%2Ffreeradius-server.git

Move CURL_AT_LEAST_VERSION macro into header

And trivial alignment with upstream codebase
---

diff --git a/src/lib/curl/base.c b/src/lib/curl/base.c
index 5b3e4574d25..f1bbd5257e8 100644
--- a/src/lib/curl/base.c
+++ b/src/lib/curl/base.c
@@ -31,14 +31,6 @@
 #include <curl/curl.h>
 #include <talloc.h>
 
-/*
- *	We have to use this as curl uses lots of enums
- */
-#ifndef CURL_AT_LEAST_VERSION
-#  define CURL_VERSION_BITS(x, y, z) ((x) << 16 | (y) << 8 | z)
-#  define CURL_AT_LEAST_VERSION(x, y, z) (LIBCURL_VERSION_NUM >= CURL_VERSION_BITS(x, y, z))
-#endif
-
 static uint32_t instance_count = 0;
 static fr_dict_t const *dict_freeradius; /*internal dictionary for server*/
 
diff --git a/src/lib/curl/base.h b/src/lib/curl/base.h
index bdc2b6cf17a..b6be40b6c14 100644
--- a/src/lib/curl/base.h
+++ b/src/lib/curl/base.h
@@ -71,6 +71,13 @@ do {\
 	}\
 } while (0)
 
+/*
+ *␉·····We have to use this as curl uses lots of enums
+ */
+#ifndef CURL_AT_LEAST_VERSION
+#  define CURL_VERSION_BITS(x, y, z) ((x) << 16 | (y) << 8 | (z))
+#  define CURL_AT_LEAST_VERSION(x, y, z) (LIBCURL_VERSION_NUM >= CURL_VERSION_BITS(x, y, z))
+#endif
 
 /** Uctx data for timer and I/O functions
  *