diff options
| author | Mark Wielaard <mark@klomp.org> | 2022-12-21 18:21:08 +0100 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2022-12-21 18:21:18 +0100 |
| commit | 304741e11018c29e7ff17751e05dcc5c786a3fd9 (patch) | |
| tree | 8a180e5f8e3174c186d22c00da8c7a045a9fd218 | |
| parent | d2bf497b12fbd49b4996ccf0744303ffd67735b1 (diff) | |
| download | elfutils-304741e11018c29e7ff17751e05dcc5c786a3fd9.tar.gz | |
debuginfod: Define CURL_AT_LEAST_VERSION if necessary
Older curl.h don't define CURL_AT_LEAST_VERSION, so define it
ourselves because it is nicer than doing hex encoded version
comparisons.
Signed-off-by: Mark Wielaard <mark@klomp.org>
| -rw-r--r-- | debuginfod/ChangeLog | 4 | ||||
| -rw-r--r-- | debuginfod/debuginfod-client.c | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog index 2c65d862..2ddb7ca0 100644 --- a/debuginfod/ChangeLog +++ b/debuginfod/ChangeLog @@ -1,3 +1,7 @@ +2022-12-21 Mark Wielaard <mark@klomp.org> + + * debuginfod-client.c: Define CURL_AT_LEAST_VERSION. + 2022-12-21 Andrew Paprocki <andrew@ishiboo.com> * debuginfod-client.c: Make compilable against newer curl. PR29926 diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c index 692aecce..a16165bd 100644 --- a/debuginfod/debuginfod-client.c +++ b/debuginfod/debuginfod-client.c @@ -105,6 +105,13 @@ void debuginfod_end (debuginfod_client *c) { } #include <fts.h> #endif +/* Older curl.h don't define CURL_AT_LEAST_VERSION. */ +#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 + #include <pthread.h> static pthread_once_t init_control = PTHREAD_ONCE_INIT; |