diff options
Diffstat (limited to 'include/ap_release.h')
| -rw-r--r-- | include/ap_release.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/include/ap_release.h b/include/ap_release.h index f01d3a10..0d54fa6f 100644 --- a/include/ap_release.h +++ b/include/ap_release.h @@ -22,8 +22,6 @@ #ifndef AP_RELEASE_H #define AP_RELEASE_H -#include "apr_general.h" /* stringify */ - #define AP_SERVER_COPYRIGHT \ "Copyright 2013 The Apache Software Foundation." @@ -45,15 +43,25 @@ #define AP_SERVER_MAJORVERSION_NUMBER 2 #define AP_SERVER_MINORVERSION_NUMBER 4 -#define AP_SERVER_PATCHLEVEL_NUMBER 4 +#define AP_SERVER_PATCHLEVEL_NUMBER 6 #define AP_SERVER_DEVBUILD_BOOLEAN 0 -#define AP_SERVER_ADD_STRING "-dev" /* Synchronize the above with docs/manual/style/version.ent */ #if !AP_SERVER_DEVBUILD_BOOLEAN -#undef AP_SERVER_ADD_STRING #define AP_SERVER_ADD_STRING "" +#else +#ifndef AP_SERVER_ADD_STRING +#define AP_SERVER_ADD_STRING "-dev" +#endif +#endif + +/* APR_STRINGIFY is defined here, and also in apr_general.h, so wrap it */ +#ifndef APR_STRINGIFY +/** Properly quote a value as a string in the C preprocessor */ +#define APR_STRINGIFY(n) APR_STRINGIFY_HELPER(n) +/** Helper macro for APR_STRINGIFY */ +#define APR_STRINGIFY_HELPER(n) #n #endif /* keep old macros as well */ |