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 5b3e4574d25b68369a4f5f916c2deee9c0d7e481..f1bbd5257e8af70497486ba5ad6abe7403d9656e 100644 (file)
--- 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 bdc2b6cf17aed59beb144a5d0c3aaf3ee6c223bf..b6be40b6c145ba07be0b80878f231fba42a0e927 100644 (file)
--- 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
  *