From e1058170fa9f221c827ab99d8856080648812a88 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Fri, 28 Jun 2019 10:54:34 +0200 Subject: Switch to an OS-independent XDR implementation for protocol evaluations --- src/app/prototest/Makefile.inc | 4 ++-- src/app/prototest/main.cc | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'src/app') diff --git a/src/app/prototest/Makefile.inc b/src/app/prototest/Makefile.inc index ee509a7..c088f6b 100644 --- a/src/app/prototest/Makefile.inc +++ b/src/app/prototest/Makefile.inc @@ -69,12 +69,12 @@ endif ifeq (${prototest_xdr}, 1) COMMON_FLAGS += -DPROTOTEST_XDR - CXX_TARGETS += src/os/object/xdrstream.cc src/os/object/xdrinput.cc + CXX_TARGETS += src/lib/xdr.cc endif ifeq (${prototest_xdr16}, 1) COMMON_FLAGS += -DPROTOTEST_XDR16 - CXX_TARGETS += src/os/object/xdr16stream.cc src/os/object/xdr16input.cc + CXX_TARGETS += src/lib/xdr16.cc endif # Don't try to make .capnp from .capnp.c diff --git a/src/app/prototest/main.cc b/src/app/prototest/main.cc index ee5c958..7fc897e 100644 --- a/src/app/prototest/main.cc +++ b/src/app/prototest/main.cc @@ -35,14 +35,10 @@ #include "ubj.h" #endif #ifdef PROTOTEST_XDR -#include "object/stdbuf.h" -#include "object/xdrstream.h" -#include "object/xdrinput.h" +#include "lib/xdr.h" #endif #ifdef PROTOTEST_XDR16 -#include "object/stdbuf.h" -#include "object/xdr16stream.h" -#include "object/xdr16input.h" +#include "lib/xdr16.h" #endif #include -- cgit v1.2.3