summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorPetteri Aimonen <jpa@git.mail.kapsi.fi>2012-10-29 18:34:24 +0200
committerPetteri Aimonen <jpa@git.mail.kapsi.fi>2012-10-29 18:34:24 +0200
commit0ee4bb96b1e53d16a29869864eff87c8934894ae (patch)
tree8ec4a0822eb8b666f6dac2918a4c0c0051f97b49 /tests
parent28b0136ea4dcd045f0422d16a25b7d82b0d2aaee (diff)
Allow defining field type in .proto.
Update issue 30 Status: FixedInGit
Diffstat (limited to 'tests')
-rw-r--r--tests/options.expected2
-rw-r--r--tests/options.proto5
2 files changed, 7 insertions, 0 deletions
diff --git a/tests/options.expected b/tests/options.expected
index e184cf91..ef74a00d 100644
--- a/tests/options.expected
+++ b/tests/options.expected
@@ -1,3 +1,5 @@
char filesize[20];
char msgsize[30];
char fieldsize[40];
+pb_callback_t int32_callback;
+
diff --git a/tests/options.proto b/tests/options.proto
index 73edf2ba..6ba7c070 100644
--- a/tests/options.proto
+++ b/tests/options.proto
@@ -25,4 +25,9 @@ message Message3
required string fieldsize = 1 [(nanopb).max_size = 40];
}
+// Forced callback field
+message Message4
+{
+ required int32 int32_callback = 1 [(nanopb).type = FT_CALLBACK];
+}