summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--vnet/vnet/l2/l2_bd.c2
-rw-r--r--vnet/vnet/l2/l2_bd.h2
-rw-r--r--vpp/app/version.c16
3 files changed, 18 insertions, 2 deletions
diff --git a/vnet/vnet/l2/l2_bd.c b/vnet/vnet/l2/l2_bd.c
index 24f96d5749c..31f02c63eff 100644
--- a/vnet/vnet/l2/l2_bd.c
+++ b/vnet/vnet/l2/l2_bd.c
@@ -36,7 +36,7 @@ bd_main_t bd_main;
// Init bridge domain if not done already
// For feature bitmap, set all bits except ARP termination
-inline void
+void
bd_validate (l2_bridge_domain_t * bd_config)
{
if (!bd_is_valid (bd_config)) {
diff --git a/vnet/vnet/l2/l2_bd.h b/vnet/vnet/l2/l2_bd.h
index 9d29a83b22f..9ff0a864c59 100644
--- a/vnet/vnet/l2/l2_bd.h
+++ b/vnet/vnet/l2/l2_bd.h
@@ -82,7 +82,7 @@ bd_is_valid (l2_bridge_domain_t * bd_config)
}
// Init bridge domain if not done already
-inline void
+void
bd_validate (l2_bridge_domain_t * bd_config);
diff --git a/vpp/app/version.c b/vpp/app/version.c
index f6aaa0be283..9949b1388ec 100644
--- a/vpp/app/version.c
+++ b/vpp/app/version.c
@@ -22,6 +22,21 @@ static char * vpe_version_string =
" at " VPP_BUILD_DATE;
static char * vpe_dir_string = "Built in " VPP_BUILD_TOPDIR;
+static char * vpe_compiler = "Compiled with "
+#if defined(__INTEL_COMPILER)
+#define __(x) #x
+#define _(x) __(x)
+ "icc " _(__INTEL_COMPILER) " (" __VERSION__ ")";
+#undef _
+#undef __
+#elif defined(__clang__)
+ "Clang/LLVM " __clang_version__;
+#elif defined (__GNUC__)
+ "GCC " __VERSION__;
+#else
+ "unknown compiler";
+#endif
+
static clib_error_t *
show_vpe_version_command_fn (vlib_main_t * vm,
unformat_input_t * input,
@@ -30,6 +45,7 @@ show_vpe_version_command_fn (vlib_main_t * vm,
vlib_cli_output (vm, "%s", vpe_version_string);
if (unformat (input, "verbose")){
vlib_cli_output (vm, "%s", vpe_dir_string);
+ vlib_cli_output (vm, "%s", vpe_compiler);
}
return 0;
}