You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fu...@apache.org on 2013/05/25 02:38:15 UTC
svn commit: r1486262 - in /httpd/httpd/branches/2.4.x: STATUS
include/ap_release.h
Author: fuankg
Date: Sat May 25 00:38:15 2013
New Revision: 1486262
URL: http://svn.apache.org/r1486262
Log:
Make AP_SERVER_ADD_STRING define-able from CFLAGS.
backport of r1481955.
Reviewed by: minfrin, humbedooh
Modified:
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/include/ap_release.h
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1486262&r1=1486261&r2=1486262&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sat May 25 00:38:15 2013
@@ -115,11 +115,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
2.4.x patch: trunk patch works (minus CHANGES)
+1: minfrin, jim, jorton
- * ap_release.h: Make AP_SERVER_ADD_STRING define-able from CFLAGS.
- trunk patch: http://svn.apache.org/r1481955
- 2.4.x patch: trunk works (with fuzz)
- +1: fuankg, minfrin, humbedooh
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.4.x/include/ap_release.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/ap_release.h?rev=1486262&r1=1486261&r2=1486262&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/ap_release.h (original)
+++ httpd/httpd/branches/2.4.x/include/ap_release.h Sat May 25 00:38:15 2013
@@ -47,13 +47,15 @@
#define AP_SERVER_MINORVERSION_NUMBER 4
#define AP_SERVER_PATCHLEVEL_NUMBER 5
#define AP_SERVER_DEVBUILD_BOOLEAN 1
-#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
/* keep old macros as well */