From: Neale Ranns <nranns@cisco.com>
Date: Mon, 18 Feb 2019 20:11:51 +0000 (-0800)
Subject: NAT: fix: multiple definition of nat64_cleaner_process_event_e
X-Git-Tag: v19.04-rc1~474
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=25cfb775e38b1d245e9c2cee75a77086f8f80913;hp=f4647ed885c47a72d94dd63e0903b6c1ae649813;p=vpp.git

NAT: fix: multiple definition of nat64_cleaner_process_event_e

Change-Id: Idcff6108f4f965344afce9ff614018239819dc95
Signed-off-by: Neale Ranns <nranns@cisco.com>
---

diff --git a/src/plugins/nat/in2out.c b/src/plugins/nat/in2out.c
index 403d23c3565..7ed375d46e5 100755
--- a/src/plugins/nat/in2out.c
+++ b/src/plugins/nat/in2out.c
@@ -383,6 +383,7 @@ slow_path (snat_main_t * sm, vlib_buffer_t * b0,
   return next0;
 }
 
+#ifndef CLIB_MARCH_VARIANT
 static_always_inline
   snat_in2out_error_t icmp_get_key (ip4_header_t * ip0,
 				    snat_session_key_t * p_key0)
@@ -428,7 +429,6 @@ static_always_inline
   return -1;			/* success */
 }
 
-#ifndef CLIB_MARCH_VARIANT
 /**
  * Get address and port values to be used for ICMP packet translation
  * and create session if needed
diff --git a/src/plugins/nat/nat64.h b/src/plugins/nat/nat64.h
index e805a10f29b..2bca1f9b73b 100644
--- a/src/plugins/nat/nat64.h
+++ b/src/plugins/nat/nat64.h
@@ -39,7 +39,7 @@ typedef enum
 #undef _
 } nat64_tcp_ses_state_t;
 
-enum
+typedef enum
 {
   NAT64_CLEANER_RESCHEDULE = 1,
 } nat64_cleaner_process_event_e;
diff --git a/src/plugins/nat/out2in.c b/src/plugins/nat/out2in.c
index 347d41a2d46..b743c08c3a7 100755
--- a/src/plugins/nat/out2in.c
+++ b/src/plugins/nat/out2in.c
@@ -250,6 +250,7 @@ create_session_for_static_mapping (snat_main_t * sm,
   return s;
 }
 
+#ifndef CLIB_MARCH_VARIANT
 static_always_inline
   snat_out2in_error_t icmp_get_key (ip4_header_t * ip0,
 				    snat_session_key_t * p_key0)
@@ -295,7 +296,6 @@ static_always_inline
   return -1;			/* success */
 }
 
-#ifndef CLIB_MARCH_VARIANT
 /**
  * Get address and port values to be used for ICMP packet translation
  * and create session if needed