From: David Lamparter <equinox@opensourcerouting.org>
Date: Fri, 28 Jul 2017 12:42:13 +0000 (+0200)
Subject: protobuf: fix build
X-Git-Tag: frr-4.0-dev~473^2~2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=a805d3bbb18f9cbaabf87850ba944b036e39240f;p=mirror%2Ffrr.git

protobuf: fix build

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---

diff --git a/fpm/fpm.proto b/fpm/fpm.proto
index 318e80a92e..4597c7f8eb 100644
--- a/fpm/fpm.proto
+++ b/fpm/fpm.proto
@@ -20,6 +20,8 @@
 // CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 //
 
+syntax = "proto2";
+
 //
 // Protobuf definitions pertaining to the Forwarding Plane Manager component.
 //
diff --git a/qpb/qpb.proto b/qpb/qpb.proto
index a1595a9abd..c06debb954 100644
--- a/qpb/qpb.proto
+++ b/qpb/qpb.proto
@@ -20,6 +20,8 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+syntax = "proto2";
+
 /*
  * Protobuf definitions pertaining to the Quagga/FRR Protobuf component.
  */
@@ -87,4 +89,4 @@ enum Protocol {
   ISIS = 8;
   BGP = 9;
   OTHER = 10;
-}
\ No newline at end of file
+}
diff --git a/qpb/qpb_allocator.c b/qpb/qpb_allocator.c
index 8b0ee941a5..7e5ba5b0ce 100644
--- a/qpb/qpb_allocator.c
+++ b/qpb/qpb_allocator.c
@@ -42,8 +42,7 @@ static void _qpb_free(void *allocator_data, void *ptr)
 	linear_allocator_free(allocator_data, ptr);
 }
 
-static ProtobufCAllocator allocator_template = {_qpb_alloc, _qpb_free, NULL,
-						8192, NULL};
+static ProtobufCAllocator allocator_template = {_qpb_alloc, _qpb_free, NULL};
 
 /*
  * qpb_allocator_init_linear