summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2018-11-21 11:27:47 +0100
committerDaniel Friesel <derf@finalrewind.org>2018-11-21 11:38:53 +0100
commite8de5b7e285645b520f0516a2facbd76556d15aa (patch)
tree20495ae51f494ac1dd86fe24e6ea59621c09b194 /src
parent9bdf87a6ee56b893483e56854d6f66899c82b73d (diff)
capn-c: *.c -> *.cc
Diffstat (limited to 'src')
-rw-r--r--src/app/prototest/Makefile.inc6
-rw-r--r--src/lib/capnp-c/capn-malloc.cc (renamed from src/lib/capnp-c/capn-malloc.c)0
-rw-r--r--src/lib/capnp-c/capn-stream.cc (renamed from src/lib/capnp-c/capn-stream.c)0
-rw-r--r--src/lib/capnp-c/capn.cc (renamed from src/lib/capnp-c/capn.c)2
4 files changed, 5 insertions, 3 deletions
diff --git a/src/app/prototest/Makefile.inc b/src/app/prototest/Makefile.inc
index 4658af6..99b7a8a 100644
--- a/src/app/prototest/Makefile.inc
+++ b/src/app/prototest/Makefile.inc
@@ -24,9 +24,9 @@ endif
ifeq (${prototest_capnproto_c}, 1)
COMMON_FLAGS += -DPROTOTEST_CAPNPROTO_C
CXX_TARGETS += src/app/prototest/capnp_c_bench.capnp.cc
- CXX_TARGETS += src/lib/capnp-c/capn.c
- CXX_TARGETS += src/lib/capnp-c/capn-malloc.c
- CXX_TARGETS += src/lib/capnp-c/capn-stream.c
+ CXX_TARGETS += src/lib/capnp-c/capn.cc
+ CXX_TARGETS += src/lib/capnp-c/capn-malloc.cc
+ CXX_TARGETS += src/lib/capnp-c/capn-stream.cc
INCLUDES += -Iinclude/lib/capnp-c
endif
diff --git a/src/lib/capnp-c/capn-malloc.c b/src/lib/capnp-c/capn-malloc.cc
index 7308061..7308061 100644
--- a/src/lib/capnp-c/capn-malloc.c
+++ b/src/lib/capnp-c/capn-malloc.cc
diff --git a/src/lib/capnp-c/capn-stream.c b/src/lib/capnp-c/capn-stream.cc
index 135d1b2..135d1b2 100644
--- a/src/lib/capnp-c/capn-stream.c
+++ b/src/lib/capnp-c/capn-stream.cc
diff --git a/src/lib/capnp-c/capn.c b/src/lib/capnp-c/capn.cc
index 6e0f196..bbd7be3 100644
--- a/src/lib/capnp-c/capn.c
+++ b/src/lib/capnp-c/capn.cc
@@ -16,8 +16,10 @@
#include <stdlib.h>
#include <string.h>
#ifndef _MSC_VER
+#ifndef MULTIPASS_ARCH_arduino_nano
#include <sys/param.h>
#endif
+#endif
#define STRUCT_PTR 0
#define LIST_PTR 1