proto: Fix warnings for protoc v3

protoc v3 introduces a new syntax for proto files and warns when the
syntax is not explicitly stated.

protoc relies on the fact that undefined preprocessor symbols are
explanded to 0 but since we use -Wundef they end up generating
warnings.

Change-Id: If07abeb54e932469c8f2c4d38634a97fdae40f77
Reviewed-by: Andreas Hansson <andreas.hansson@arm.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Signed-off-by: Jason Lowe-Power <jason@lowepower.com>

diff --git a/src/proto/SConscript b/src/proto/SConscript
index ef6bc2aca0256cde850210eff192e6e01bb27a90..665d16493adfe6506b7fef966dc77f7f69c2dc69 100644 (file)
--- a/src/proto/SConscript
+++ b/src/proto/SConscript
@@ -1,6 +1,6 @@
 # -*- mode:python -*-
 
-# Copyright (c) 2012 ARM Limited
+# Copyright (c) 2012,2017 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -45,3 +45,8 @@ if env['HAVE_PROTOBUF']:
     ProtoBuf('packet.proto')
     ProtoBuf('inst.proto')
     Source('protoio.cc')
+
+    # protoc relies on the fact that undefined preprocessor symbols are
+    # explanded to 0 but since we use -Wundef they end up generating
+    # warnings.
+    env.Append(CCFLAGS='-DPROTOBUF_INLINE_NOT_IN_HEADERS=0')

diff --git a/src/proto/inst.proto b/src/proto/inst.proto
index 3e8dcde8ba70ab2ba1a9c29dcbf90d7f22131081..5ef266455fbcef1557c3304e20f7e627c00e5a21 100644 (file)
--- a/src/proto/inst.proto
+++ b/src/proto/inst.proto
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 ARM Limited
+// Copyright (c) 2014,2017 ARM Limited
 // All rights reserved
 //
 // The license below extends only to copyright in the software and shall
@@ -35,6 +35,7 @@
 //
 // Authors: Ali Saidi
 
+syntax = "proto2";
 
 // Put all the generated messages in a namespace
 package ProtoMessage;

diff --git a/src/proto/inst_dep_record.proto b/src/proto/inst_dep_record.proto
index f89e51d819c6638f3eea6d0730e1960b8a88296c..808837e12fc791338eadf9368ea56520ec0afa1c 100644 (file)
--- a/src/proto/inst_dep_record.proto
+++ b/src/proto/inst_dep_record.proto
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 ARM Limited
+// Copyright (c) 2013,2017 ARM Limited
 // All rights reserved
 //
 // The license below extends only to copyright in the software and shall
@@ -35,6 +35,8 @@
 //
 // Authors: Radhika Jagtap
 
+syntax = "proto2";
+
 // Put all the generated messages in a namespace
 package ProtoMessage;
 

diff --git a/src/proto/packet.proto b/src/proto/packet.proto
index c07206742c8849bd609e02a492a572ca5f9afc48..53f69e533f28693fdd7ff13e14d15d56632b8a99 100644 (file)
--- a/src/proto/packet.proto
+++ b/src/proto/packet.proto
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2013 ARM Limited
+// Copyright (c) 2012-2013,2017 ARM Limited
 // All rights reserved
 //
 // The license below extends only to copyright in the software and shall
@@ -35,6 +35,8 @@
 //
 // Authors: Andreas Hansson
 
+syntax = "proto2";
+
 // Put all the generated messages in a namespace
 package ProtoMessage;