diff options
| author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2014-12-22 19:42:44 +0000 |
|---|---|---|
| committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2014-12-22 19:42:44 +0000 |
| commit | 2ee782685cd07eaa598f8d1b8577b06b9cf48785 (patch) | |
| tree | 248bf96d8b1dc8e99473c16fb8619e9f28918a14 | |
| parent | 49d17ea85e455f68ad1f0da26c911ecdfc02411c (diff) | |
| download | libmicrohttpd-2ee782685cd07eaa598f8d1b8577b06b9cf48785.tar.gz libmicrohttpd-2ee782685cd07eaa598f8d1b8577b06b9cf48785.zip | |
MHD_get_version: support extraction version number from MHD_VERSION if PACKAGE_VERSION is not defined
| -rw-r--r-- | src/microhttpd/daemon.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c index cb5085b3..66453094 100644 --- a/src/microhttpd/daemon.c +++ b/src/microhttpd/daemon.c | |||
| @@ -4421,7 +4421,21 @@ MHD_set_panic_func (MHD_PanicCallback cb, void *cls) | |||
| 4421 | const char * | 4421 | const char * |
| 4422 | MHD_get_version (void) | 4422 | MHD_get_version (void) |
| 4423 | { | 4423 | { |
| 4424 | #ifdef PACKAGE_VERSION | ||
| 4424 | return PACKAGE_VERSION; | 4425 | return PACKAGE_VERSION; |
| 4426 | #else /* !PACKAGE_VERSION */ | ||
| 4427 | static char ver[12] = "\0\0\0\0\0\0\0\0\0\0\0"; | ||
| 4428 | if (0 == ver[0]) | ||
| 4429 | { | ||
| 4430 | int res = MHD_snprintf_(ver, sizeof(ver), "%x.%x.%x", | ||
| 4431 | (((int)MHD_VERSION >> 24) & 0xFF), | ||
| 4432 | (((int)MHD_VERSION >> 16) & 0xFF), | ||
| 4433 | (((int)MHD_VERSION >> 8) & 0xFF)); | ||
| 4434 | if (0 >= res || sizeof(ver) <= res) | ||
| 4435 | return "0.0.0"; /* Can't return real version*/ | ||
| 4436 | } | ||
| 4437 | return ver; | ||
| 4438 | #endif /* !PACKAGE_VERSION */ | ||
| 4425 | } | 4439 | } |
| 4426 | 4440 | ||
| 4427 | 4441 | ||