summaryrefslogtreecommitdiffstats
path: root/generator/proto/nanopb.proto
diff options
context:
space:
mode:
authorPetteri Aimonen <jpa@git.mail.kapsi.fi>2014-02-12 19:43:04 +0200
committerPetteri Aimonen <jpa@git.mail.kapsi.fi>2014-02-12 19:43:04 +0200
commit542463dbaa3acae564e4a1eddf264e1fe226c38a (patch)
treecfca5d64513f55663fde253a104916dc316ae310 /generator/proto/nanopb.proto
parentfe0bf121eb606d9accbc0fc8be6b1ff6fd5f6f27 (diff)
Move descriptor.proto to google/protobuf directory where it belongs.
This fixes some interoperability problems when trying to compile nanopb.proto for e.g. the Google's C++ library. Update issue 104 Status: FixedInGit
Diffstat (limited to 'generator/proto/nanopb.proto')
-rw-r--r--generator/proto/nanopb.proto2
1 files changed, 1 insertions, 1 deletions
diff --git a/generator/proto/nanopb.proto b/generator/proto/nanopb.proto
index 2ea011f4..2be2f803 100644
--- a/generator/proto/nanopb.proto
+++ b/generator/proto/nanopb.proto
@@ -5,7 +5,7 @@
// These are used by nanopb to generate statically allocable structures
// for memory-limited environments.
-import "descriptor.proto";
+import "google/protobuf/descriptor.proto";
option java_package = "fi.kapsi.koti.jpa.nanopb";