log-constants.patch

   1 fix:
   2
   3 third_party/chromium/src/base/logging.h:292:19: error: expected unqualified-id before numeric constant
   4
   5 "fix":
   6 mod_spdy/mod_spdy.cc: In function 'void {anonymous}::ChildInit(apr_pool_t*, server_rec*)':
   7 mod_spdy/mod_spdy.cc:253:31: error: 'LOG_INFO' was not declared in this scope
   8 mod_spdy/mod_spdy.cc:253:31: note: suggested alternative:
   9 In file included from third_party/chromium/src/net/spdy/spdy_protocol.h:13:0,
  10                  from third_party/chromium/src/net/spdy/spdy_framer.h:19,
  11                  from ./mod_spdy/common/http_to_spdy_converter.h:24,
  12                  from ./mod_spdy/apache/filters/http_to_spdy_filter.h:24,
  13                  from mod_spdy/mod_spdy.cc:40:
  14 third_party/chromium/src/base/logging.h:290:19: note:   'logging::LOG_INFO'
  15 mod_spdy/mod_spdy.cc:253:45: error: template argument 1 is invalid
  16 mod_spdy/mod_spdy.cc:253:108: error: invalid type in declaration before ';' token
  17 --- mod-spdy-0.9.3.3/third_party/chromium/src/base/logging.h~   2013-03-04 11:44:06.000000000 +0200
  18 +++ mod-spdy-0.9.3.3/third_party/chromium/src/base/logging.h    2013-03-04 11:44:09.508892187 +0200
  19 @@ -286,7 +286,9 @@
  20  const LogSeverity LOG_VERBOSE = -1;  // This is level 1 verbosity
  21  // Note: the log severities are used to index into the array of names,
  22  // see log_severity_names.
  23 +#undef LOG_INFO
  24  const LogSeverity LOG_INFO = 0;
  25 +#undef LOG_WARNING
  26  const LogSeverity LOG_WARNING = 1;
  27  const LogSeverity LOG_ERROR = 2;
  28  const LogSeverity LOG_ERROR_REPORT = 3;
  29 --- mod-spdy-0.9.3.3/mod_spdy/mod_spdy.cc~      2013-03-04 11:24:35.000000000 +0200
  30 +++ mod-spdy-0.9.3.3/mod_spdy/mod_spdy.cc       2013-03-04 11:47:51.855821877 +0200
  31 @@ -250,7 +250,7 @@
  32    // determine the most verbose log level of any server in the list.
  33    bool spdy_enabled = false;
  34    int max_apache_log_level = APLOG_EMERG;  // the least verbose log level
  35 -  COMPILE_ASSERT(APLOG_INFO > APLOG_ERR, bigger_number_means_more_verbose);
  36 +  //COMPILE_ASSERT(APLOG_INFO > APLOG_ERR, bigger_number_means_more_verbose);
  37    for (server_rec* server = server_list; server != NULL;
  38         server = server->next) {
  39      spdy_enabled |= mod_spdy::GetServerConfig(server)->spdy_enabled();