You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sf...@apache.org on 2012/02/27 15:03:31 UTC
svn commit: r1294162 - in /httpd/httpd/branches/2.4.x: ./ STATUS
include/ap_config.h include/ap_mmn.h include/http_log.h
Author: sf
Date: Mon Feb 27 14:03:31 2012
New Revision: 1294162
URL: http://svn.apache.org/viewvc?rev=1294162&view=rev
Log:
Merge r1292043:
Add AP_HAVE_C99 to make correct check for C99 less onerous
Using __STDC_VERSION__ without checking if it is defined causes warnings
on C89.
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/include/ap_config.h
httpd/httpd/branches/2.4.x/include/ap_mmn.h
httpd/httpd/branches/2.4.x/include/http_log.h
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 27 14:03:31 2012
@@ -1,3 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap:1150158-1150173
/httpd/httpd/branches/wombat-integration:723609-723841
-/httpd/httpd/trunk:1200496,1200556,1200702,1200955,1200968,1201032,1201042,1201111,1201194,1201198,1201202,1201450,1201956,1202236,1202453,1202456,1202886,1203400,1203714,1203859,1203980,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206472,1206587,1206850,1206940,1206978,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210067,1210080,1210120,1210124,1210130,1210148,1210219,1210221,1210252,1210284,1210336,1210378,1210725,1210892,1210951,1210954,1211351,1211364,1211490,1211495,1211528,1211663,1211680,1212872,1212883,1213338,1213381,1213391,1213567,1214003,1214005,1214015,1215514,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221205,1221292,1222335,1222370,1222473,1222915,1222917,1222921,1223048,1225060,1225197-1225199,1225223,1225380,1225476,1225478,1225791,12
25795-1225796,1226339,1226375,1227910,1228700,1228816,1229024,1229059,1229099,1229116,1229134,1229136,1229930,1230286,1231442,1231446,1231508,1231510,1231518,1232575,1232594,1232630,1232838,1234180,1234297,1234479,1234511,1234565,1234574,1234642-1234643,1234876,1234899,1235019,1236122,1236701,1237407,1238545,1238768,1239029-1239030,1239071,1239565,1240315,1240470,1240778,1241069,1241071,1242967,1243176,1243246,1243797,1243799,1244211,1245717,1290823,1290835,1291819-1291820,1291834,1291840,1293405,1293534-1293535,1293658,1293678,1293708
+/httpd/httpd/trunk:1200496,1200556,1200702,1200955,1200968,1201032,1201042,1201111,1201194,1201198,1201202,1201450,1201956,1202236,1202453,1202456,1202886,1203400,1203714,1203859,1203980,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206472,1206587,1206850,1206940,1206978,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210067,1210080,1210120,1210124,1210130,1210148,1210219,1210221,1210252,1210284,1210336,1210378,1210725,1210892,1210951,1210954,1211351,1211364,1211490,1211495,1211528,1211663,1211680,1212872,1212883,1213338,1213381,1213391,1213567,1214003,1214005,1214015,1215514,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221205,1221292,1222335,1222370,1222473,1222915,1222917,1222921,1223048,1225060,1225197-1225199,1225223,1225380,1225476,1225478,1225791,12
25795-1225796,1226339,1226375,1227910,1228700,1228816,1229024,1229059,1229099,1229116,1229134,1229136,1229930,1230286,1231442,1231446,1231508,1231510,1231518,1232575,1232594,1232630,1232838,1234180,1234297,1234479,1234511,1234565,1234574,1234642-1234643,1234876,1234899,1235019,1236122,1236701,1237407,1238545,1238768,1239029-1239030,1239071,1239565,1240315,1240470,1240778,1241069,1241071,1242967,1243176,1243246,1243797,1243799,1244211,1245717,1290823,1290835,1291819-1291820,1291834,1291840,1292043,1293405,1293534-1293535,1293658,1293678,1293708
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1294162&r1=1294161&r2=1294162&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Feb 27 14:03:31 2012
@@ -88,13 +88,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * Add AP_HAVE_C99 to make correct check for C99 less onerous
- Using __STDC_VERSION__ without checking if it is defined causes warnings
- on C89.
- Trunk patches: http://svn.apache.org/viewvc?view=revision&revision=1292043
- 2.4.x patch: http://people.apache.org/~sf/AP_HAVE_C99.diff
- +1: sf, minfrin, trawick
-
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_config.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/ap_config.h?rev=1294162&r1=1294161&r2=1294162&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/ap_config.h (original)
+++ httpd/httpd/branches/2.4.x/include/ap_config.h Mon Feb 27 14:03:31 2012
@@ -165,11 +165,14 @@
#define AP_HAVE_RELIABLE_PIPED_LOGS TRUE
#endif
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#define AP_HAVE_C99
+#endif
+
/* Presume that the compiler supports C99-style designated
* initializers if using GCC (but not G++), or for any other compiler
* which claims C99 support. */
-#if (defined(__GNUC__) && !defined(__cplusplus)) \
- || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
+#if (defined(__GNUC__) && !defined(__cplusplus)) || defined(AP_HAVE_C99)
#define AP_HAVE_DESIGNATED_INITIALIZER
#endif
Modified: httpd/httpd/branches/2.4.x/include/ap_mmn.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/ap_mmn.h?rev=1294162&r1=1294161&r2=1294162&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/ap_mmn.h (original)
+++ httpd/httpd/branches/2.4.x/include/ap_mmn.h Mon Feb 27 14:03:31 2012
@@ -390,6 +390,7 @@
* move core_net rec definition to http_core.h;
* add insert_network_bucket hook, AP_DECLINED
* 20120211.0 (2.4.1-dev) Change re_nsub in ap_regex_t from apr_size_t to int.
+ * 20120211.1 (2.4.2) Add AP_HAVE_C99
*/
#define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
@@ -397,7 +398,7 @@
#ifndef MODULE_MAGIC_NUMBER_MAJOR
#define MODULE_MAGIC_NUMBER_MAJOR 20120211
#endif
-#define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 1 /* 0...n */
/**
* Determine if the server's current MODULE_MAGIC_NUMBER is at least a
Modified: httpd/httpd/branches/2.4.x/include/http_log.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/http_log.h?rev=1294162&r1=1294161&r2=1294162&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/http_log.h (original)
+++ httpd/httpd/branches/2.4.x/include/http_log.h Mon Feb 27 14:03:31 2012
@@ -358,7 +358,7 @@ AP_DECLARE(void) ap_log_error(const char
int level, apr_status_t status,
const server_rec *s, const char *fmt, ...);
#else
-#if __STDC_VERSION__ >= 199901L
+#ifdef AP_HAVE_C99
/* need additional step to expand APLOG_MARK first */
#define ap_log_error(...) ap_log_error__(__VA_ARGS__)
/* need server_rec *sr = ... for the case if s is verbatim NULL */
@@ -401,7 +401,7 @@ AP_DECLARE(void) ap_log_perror(const cha
int level, apr_status_t status, apr_pool_t *p,
const char *fmt, ...);
#else
-#if __STDC_VERSION__ >= 199901L && defined(APLOG_MAX_LOGLEVEL)
+#if defined(AP_HAVE_C99) && defined(APLOG_MAX_LOGLEVEL)
/* need additional step to expand APLOG_MARK first */
#define ap_log_perror(...) ap_log_perror__(__VA_ARGS__)
#define ap_log_perror__(file, line, mi, level, status, p, ...) \
@@ -443,7 +443,7 @@ AP_DECLARE(void) ap_log_rerror(const cha
int level, apr_status_t status,
const request_rec *r, const char *fmt, ...);
#else
-#if __STDC_VERSION__ >= 199901L
+#ifdef AP_HAVE_C99
/* need additional step to expand APLOG_MARK first */
#define ap_log_rerror(...) ap_log_rerror__(__VA_ARGS__)
#define ap_log_rerror__(file, line, mi, level, status, r, ...) \
@@ -487,7 +487,7 @@ AP_DECLARE(void) ap_log_cerror(const cha
int level, apr_status_t status,
const conn_rec *c, const char *fmt, ...);
#else
-#if __STDC_VERSION__ >= 199901L
+#ifdef AP_HAVE_C99
/* need additional step to expand APLOG_MARK first */
#define ap_log_cerror(...) ap_log_cerror__(__VA_ARGS__)
#define ap_log_cerror__(file, line, mi, level, status, c, ...) \
@@ -534,7 +534,7 @@ AP_DECLARE(void) ap_log_cserror(const ch
const conn_rec *c, const server_rec *s,
const char *fmt, ...);
#else
-#if __STDC_VERSION__ >= 199901L
+#ifdef AP_HAVE_C99
/* need additional step to expand APLOG_MARK first */
#define ap_log_cserror(...) ap_log_cserror__(__VA_ARGS__)
#define ap_log_cserror__(file, line, mi, level, status, c, s, ...) \