summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetteri Aimonen <jpa@git.mail.kapsi.fi>2012-09-02 19:54:35 +0300
committerPetteri Aimonen <jpa@git.mail.kapsi.fi>2012-09-02 19:54:35 +0300
commitf187aad63db2ff8e1a82508f4a43988b43e10f54 (patch)
treef96a9fd999fb178a815d6d73d581d618896f064b
parenta06dba6e49a7fc5fbc1e476539566e3f407be908 (diff)
Fix -Wextra warning in generated .pb.c files.
Compile the generated files with the same extra-strict settings as the core, in order to detect problems in tests. Update issue 32 Status: FixedInGit
-rw-r--r--pb.h2
-rw-r--r--tests/Makefile3
2 files changed, 4 insertions, 1 deletions
diff --git a/pb.h b/pb.h
index 85f4421c..f894a9a5 100644
--- a/pb.h
+++ b/pb.h
@@ -194,7 +194,7 @@ typedef enum {
#define pb_arraysize(st, m) (pb_membersize(st, m) / pb_membersize(st, m[0]))
#define pb_delta(st, m1, m2) ((int)offsetof(st, m1) - (int)offsetof(st, m2))
#define pb_delta_end(st, m1, m2) (offsetof(st, m1) - offsetof(st, m2) - pb_membersize(st, m2))
-#define PB_LAST_FIELD {0,(pb_type_t) 0,0,0}
+#define PB_LAST_FIELD {0,(pb_type_t) 0,0,0,0,0,0}
/* These macros are used for giving out error messages.
* They are mostly a debugging aid; the main error information
diff --git a/tests/Makefile b/tests/Makefile
index 3810c95f..e4c67c59 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -11,6 +11,9 @@ all: breakpoints $(TESTS) run_unittests
clean:
rm -f $(TESTS) person.pb* alltypes.pb* *.o *.gcda *.gcno
+%.pb.o: %.pb.c %.pb.h
+ $(CC) $(CFLAGS) $(CFLAGS_CORE) -c -o $@ $<
+
%.o: %.c
%.o: %.c $(DEPS)
$(CC) $(CFLAGS) -c -o $@ $<