From: Tom Peters <thopeter@cisco.com>
Date: Thu, 18 Sep 2014 20:01:11 +0000 (-0400)
Subject: latest from Russ with conflict resolution in nhttp_tables.cc
X-Git-Tag: 3.0.0-233~1411
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2976de431e8bd028572d980c2dadf397e53aac2b;p=thirdparty%2Fsnort3.git

latest from Russ with conflict resolution in nhttp_tables.cc
---

2976de431e8bd028572d980c2dadf397e53aac2b
diff --cc src/service_inspectors/nhttp_inspect/nhttp_tables.cc
index 9e9af68dc,5da586d86..3615f822c
--- a/src/service_inspectors/nhttp_inspect/nhttp_tables.cc
+++ b/src/service_inspectors/nhttp_inspect/nhttp_tables.cc
@@@ -178,6 -178,13 +178,13 @@@ const HeaderNormalizer NHttpMsgHeadShar
  const HeaderNormalizer NHttpMsgHeadShared::NORMALIZER_TRANSCODE {NORM_ENUM64, true, norm_remove_lws, nullptr,
     norm_to_lower, nullptr, norm_seq_str_code, NHttpMsgHeadShared::trans_code_list};
  
+ #if defined(__clang__)
+ // designated initializers are not supported in C++11.  However,
 -// but we're going to play compilation roullete and hopes this works.
++// but we're going to play compilation roulette and hopes this works.
+ #pragma clang diagnostic push
+ #pragma clang diagnostic ignored "-Wc99-extensions"
+ #endif
+ 
  const HeaderNormalizer* const NHttpMsgHeadShared::header_norms[HEAD__MAXVALUE] = { [0] = &NORMALIZER_NIL,
      [HEAD__OTHER] = &NORMALIZER_BASIC,
      [HEAD_CACHE_CONTROL] = &NORMALIZER_BASIC,
@@@ -233,6 -240,12 +240,10 @@@
      [HEAD_TRUE_CLIENT_IP] = &NORMALIZER_BASIC
  };
  
+ #if defined(__clang__)
+ #pragma clang diagnostic pop
+ #endif
+ 
 -const int32_t NHttpMsgHeadShared::num_norms = HEAD__MAXVALUE-1;
 -
  const RuleMap NHttpModule::nhttp_events[] =
  {
      { EVENT_ASCII,                           "(nhttp_inspect) ascii encoding" },