You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by tr...@apache.org on 2013/11/19 02:11:11 UTC

svn commit: r1543283 - /httpd/httpd/branches/2.4.x/build/win32/httpd.rc

Author: trawick
Date: Tue Nov 19 01:11:10 2013
New Revision: 1543283

URL: http://svn.apache.org/r1543283
Log:
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

Modified:
    httpd/httpd/branches/2.4.x/build/win32/httpd.rc

Modified: httpd/httpd/branches/2.4.x/build/win32/httpd.rc
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/build/win32/httpd.rc?rev=1543283&r1=1543282&r2=1543283&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/build/win32/httpd.rc (original)
+++ httpd/httpd/branches/2.4.x/build/win32/httpd.rc Tue Nov 19 01:11:10 2013
@@ -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)