X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp%2Fapi%2Ftypes.h;h=9864e8c38a80857e71a721ac5ff0ce926cde7ca7;hb=HEAD;hp=a625e5d427a2c6008ae5f306b095250bb08d721c;hpb=50f0ac0f097e5495da1f2b1816106e3d420ff34b;p=vpp.git

diff --git a/src/vpp/api/types.h b/src/vpp/api/types.h
index a625e5d427a..7a546dbdc0d 100644
--- a/src/vpp/api/types.h
+++ b/src/vpp/api/types.h
@@ -19,12 +19,13 @@
 #include <vlibapi/api_common.h>
 #include <vlibapi/api_types.h>
 
-#define vl_typedefs		/* define message structures */
-#include <vpp/api/vpe_all_api_h.h>
-#undef vl_typedefs
+#include <vnet/ip/ip_types.api_types.h>
+#include <vnet/ethernet/ethernet_types.api_types.h>
 
-const vl_api_mac_address_t VL_API_ZERO_MAC_ADDRESS;
-const vl_api_address_t VL_API_ZERO_ADDRESS;
+#include <vpp/api/vpe_types.api_types.h>
+
+extern const vl_api_mac_address_t VL_API_ZERO_MAC_ADDRESS;
+extern const vl_api_address_t VL_API_ZERO_ADDRESS;
 
 extern uword unformat_vl_api_mac_address (unformat_input_t * input, va_list * args);
 extern uword unformat_vl_api_address_family (unformat_input_t * input, va_list * args);
@@ -32,14 +33,16 @@ extern uword unformat_vl_api_address (unformat_input_t * input, va_list * args);
 extern uword unformat_vl_api_ip4_address (unformat_input_t * input, va_list * args);
 extern uword unformat_vl_api_ip6_address (unformat_input_t * input, va_list * args);
 extern uword unformat_vl_api_prefix (unformat_input_t * input, va_list * args);
+extern uword unformat_vl_api_mprefix (unformat_input_t * input, va_list * args);
+extern uword unformat_vl_api_version (unformat_input_t * input, va_list * args);
 
 extern u8 *format_vl_api_address (u8 * s, va_list * args);
 extern u8 *format_vl_api_address_family (u8 * s, va_list * args);
 extern u8 *format_vl_api_ip4_address (u8 * s, va_list * args);
 extern u8 *format_vl_api_ip6_address (u8 * s, va_list * args);
-extern u8 *format_vl_api_address_union (u8 * s, va_list * args);
 extern u8 *format_vl_api_prefix (u8 * s, va_list * args);
 extern u8 *format_vl_api_mprefix (u8 * s, va_list * args);
 extern u8 *format_vl_api_mac_address (u8 * s, va_list * args);
+extern u8 *format_vl_api_version (u8 * s, va_list * args);
 
 #endif