From 8bb9759e8c136f3856a9eddf1907d97ca54e16fb Mon Sep 17 00:00:00 2001 From: James McKaskill Date: Wed, 8 May 2013 22:42:06 -0400 Subject: [PATCH] Move schema.* to schema.capnp.* --- Makefile | 4 ++-- compiler/capnpc-c.c | 2 +- compiler/schema-test.cpp | 2 +- compiler/{schema.c => schema.capnp.c} | 2 +- compiler/{schema.h => schema.capnp.h} | 0 5 files changed, 5 insertions(+), 5 deletions(-) rename compiler/{schema.c => schema.capnp.c} (99%) rename compiler/{schema.h => schema.capnp.h} (100%) diff --git a/Makefile b/Makefile index faa127c..9531ab7 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ clean: capn.so: capn-malloc.o capn-stream.o capn.o $(CC) -shared $(LDFLAGS) $^ -o $@ -capnpc-c: compiler/capnpc-c.o compiler/schema.o capn.so +capnpc-c: compiler/capnpc-c.o compiler/schema.capnp.o capn.so $(CC) $(LDFLAGS) $^ -o $@ test: capn-test @@ -23,5 +23,5 @@ test: capn-test %-test.o: %-test.cpp *.h *.c *.inc $(CXX) -g -Wall -Werror -I. `gtest-config --cppflags --cxxflags` -o $@ -c $< -capn-test: capn-test.o capn-stream-test.o compiler/schema-test.o compiler/schema.o +capn-test: capn-test.o capn-stream-test.o compiler/schema-test.o compiler/schema.capnp.o $(CXX) -g -Wall -Werror -I. `gtest-config --ldflags --libs` -o $@ $^ diff --git a/compiler/capnpc-c.c b/compiler/capnpc-c.c index 0113e02..45650c6 100644 --- a/compiler/capnpc-c.c +++ b/compiler/capnpc-c.c @@ -1,4 +1,4 @@ -#include "schema.h" +#include "schema.capnp.h" struct scope { struct capn_tree hdr; diff --git a/compiler/schema-test.cpp b/compiler/schema-test.cpp index 0117cec..a36642f 100644 --- a/compiler/schema-test.cpp +++ b/compiler/schema-test.cpp @@ -1,4 +1,4 @@ -#include "schema.h" +#include "schema.capnp.h" #include static const uint8_t simple_schema[] = { diff --git a/compiler/schema.c b/compiler/schema.capnp.c similarity index 99% rename from compiler/schema.c rename to compiler/schema.capnp.c index 9919cd4..2636390 100644 --- a/compiler/schema.c +++ b/compiler/schema.capnp.c @@ -1,4 +1,4 @@ -#include "schema.h" +#include "schema.capnp.h" void get_Node(struct Node *s, Node_list l, int i) { Node_ptr p = {capn_getp(l.p, i)}; diff --git a/compiler/schema.h b/compiler/schema.capnp.h similarity index 100% rename from compiler/schema.h rename to compiler/schema.capnp.h