summaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
authorDaniel Friesel <daniel.friesel@uos.de>2019-06-28 10:54:34 +0200
committerDaniel Friesel <daniel.friesel@uos.de>2019-06-28 10:54:34 +0200
commite1058170fa9f221c827ab99d8856080648812a88 (patch)
treebc6f5e3be2b09f76c26751960adb29af8db132ed /src/app
parentbfd8f297e6af00841d93e807e3e33e5a6e6e226e (diff)
Switch to an OS-independent XDR implementation for protocol evaluations
Diffstat (limited to 'src/app')
-rw-r--r--src/app/prototest/Makefile.inc4
-rw-r--r--src/app/prototest/main.cc8
2 files changed, 4 insertions, 8 deletions
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 <stdint.h>