From 824492e8ac328eb324c4dfedb378f4ca98bf40b7 Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Thu, 4 Jul 2013 13:12:42 +0000 Subject: [PATCH] Avoid including apr_general.h. The MSVC Resource Compiler truncates macro names at char 31. Since apr_general.h includes apr.h which in turn includes system headers we get warnings or errors with the Resource Compiler with newer system headers (VC10 and later) which have macro names defined with more than 31 chars. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1499742 13f79535-47bb-0310-9956-ffa450edef68 --- include/ap_release.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/include/ap_release.h b/include/ap_release.h index 089c142012..9b2b133c9c 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." @@ -58,6 +56,14 @@ #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 */ #define AP_SERVER_MAJORVERSION APR_STRINGIFY(AP_SERVER_MAJORVERSION_NUMBER) #define AP_SERVER_MINORVERSION APR_STRINGIFY(AP_SERVER_MINORVERSION_NUMBER) -- 2.50.0