diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2020-03-17 17:55:46 +0000 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2020-03-17 17:55:46 +0000 |
| commit | 308e970e712df9158c5b990a0adcf59707b12e7d (patch) | |
| tree | 3bc618b6de13f8a5298b868e937cc9863770b20f /src | |
| parent | 7012a2c62e5b54eab88c119383022ec7ce86e9b2 (diff) | |
| parent | dbd81bbb89ae91334fb2e608e6860ed0055d1915 (diff) | |
| download | slirp-308e970e712df9158c5b990a0adcf59707b12e7d.zip slirp-308e970e712df9158c5b990a0adcf59707b12e7d.tar.gz slirp-308e970e712df9158c5b990a0adcf59707b12e7d.tar.bz2 | |
Merge branch 'vcs-version' into 'master'
Teach slirp_version_string() to return vcs version
See merge request slirp/libslirp!34
Diffstat (limited to 'src')
| -rw-r--r-- | src/libslirp-version.h.in | 1 | ||||
| -rw-r--r-- | src/version.c | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/libslirp-version.h.in b/src/libslirp-version.h.in index 59f7a46..faa6c85 100644 --- a/src/libslirp-version.h.in +++ b/src/libslirp-version.h.in @@ -9,6 +9,7 @@ extern "C" { #define SLIRP_MAJOR_VERSION @SLIRP_MAJOR_VERSION@ #define SLIRP_MINOR_VERSION @SLIRP_MINOR_VERSION@ #define SLIRP_MICRO_VERSION @SLIRP_MICRO_VERSION@ +#define SLIRP_VERSION_STRING @SLIRP_VERSION_STRING@ #define SLIRP_CHECK_VERSION(major,minor,micro) \ (SLIRP_MAJOR_VERSION > (major) || \ diff --git a/src/version.c b/src/version.c index a837323..93e0be9 100644 --- a/src/version.c +++ b/src/version.c @@ -1,11 +1,8 @@ /* SPDX-License-Identifier: BSD-3-Clause */ #include "libslirp.h" -#include "util.h" const char * slirp_version_string(void) { - return stringify(SLIRP_MAJOR_VERSION) "." - stringify(SLIRP_MINOR_VERSION) "." - stringify(SLIRP_MICRO_VERSION); + return SLIRP_VERSION_STRING; } |