From: Jeff Trawick <trawick@apache.org>
Date: Tue, 19 Nov 2013 01:11:10 +0000 (+0000)
Subject: Merge r1543282 from trunk:
X-Git-Tag: 2.4.7~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ca8b979622cdcb57272bfdd72e74bd29e3f3ac4;p=apache

Merge r1543282 from trunk:

Stringify ICON_FILE, like other values passed in via -Dxx=yy

With an out of tree build like cmake, certain paths to the source tree and icon
file can foil parsing of this line by the resource compiler unless the path is
quoted.

Submitted by: Bert Huijben
Reviewed by: trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1543283 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/build/win32/httpd.rc b/build/win32/httpd.rc
index 0c557ee1e0..06013f695e 100644
--- a/build/win32/httpd.rc
+++ b/build/win32/httpd.rc
@@ -31,7 +31,7 @@
 
 
 #ifdef ICON_FILE
-1 ICON DISCARDABLE ICON_FILE
+1 ICON DISCARDABLE APR_STRINGIFY(ICON_FILE)
 #endif
 
 #define LONG_NAME_STR APR_STRINGIFY(LONG_NAME)