RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-27 07:02:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: show Built with PCRE version

Browse Source 
Inspired by PCRE's pcre_version.c and improved with Willy's
suggestions. Reusable parts have been added to
include/common/standard.h.
This commit is contained in:
Lukas Tribus 2016-09-12 21:42:07 +00:00 committed by Willy Tarreau
parent d64788d9c6
commit dcbc5c5ecf
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/common/standard.h
View File

@ -1140,4 +1140,13 @@ static inline void *my_realloc2(void *ptr, size_t size)
return ret;
}
/* HAP_STRING() makes a string from a literal while HAP_XSTRING() first
* evaluates the argument and is suited to pass macros.
*
* They allow macros like PCRE_MAJOR to be defined without quotes, which
* is convenient for applications that want to test its value.
*/
#define HAP_STRING(...) #__VA_ARGS__
#define HAP_XSTRING(...) HAP_STRING(__VA_ARGS__)
#endif /* _COMMON_STANDARD_H */

3
src/haproxy.c
View File

@ -352,6 +352,9 @@ void display_build_opts()
#endif
#ifdef USE_PCRE
printf("Built with PCRE version : %s\n", (HAP_XSTRING(Z PCRE_PRERELEASE)[1] == 0)?
HAP_XSTRING(PCRE_MAJOR.PCRE_MINOR PCRE_DATE) :
HAP_XSTRING(PCRE_MAJOR.PCRE_MINOR) HAP_XSTRING(PCRE_PRERELEASE PCRE_DATE));
printf("Running on PCRE version : %s", pcre_version());
printf("\nPCRE library supports JIT : ");
#ifdef USE_PCRE_JIT