From ccd1ec9c14cff45b8d90b48a997a0240e4783d7e Mon Sep 17 00:00:00 2001 From: dufourj Date: Tue, 8 May 2007 16:32:33 +0000 Subject: * General: - add missing link for using updating.sh script for PC104; - correct compilation errors. --- i/marvin/build/update.sh | 1 + i/marvin/src/asserv/asserv.cc | 2 ++ i/marvin/src/proto/proto.hh | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) create mode 120000 i/marvin/build/update.sh (limited to 'i/marvin') diff --git a/i/marvin/build/update.sh b/i/marvin/build/update.sh new file mode 120000 index 0000000..f574d8e --- /dev/null +++ b/i/marvin/build/update.sh @@ -0,0 +1 @@ +../../pc104/initrd/update.sh \ No newline at end of file diff --git a/i/marvin/src/asserv/asserv.cc b/i/marvin/src/asserv/asserv.cc index 48c2ad5..e196803 100644 --- a/i/marvin/src/asserv/asserv.cc +++ b/i/marvin/src/asserv/asserv.cc @@ -25,6 +25,8 @@ #include "asserv.hh" #include "config/config.hh" +#include + /// Constructor. Asserv::Asserv (Asserv::Receiver &receiver) : proto_ (*this), receiver_ (receiver) diff --git a/i/marvin/src/proto/proto.hh b/i/marvin/src/proto/proto.hh index 340b1fb..a45db91 100644 --- a/i/marvin/src/proto/proto.hh +++ b/i/marvin/src/proto/proto.hh @@ -87,7 +87,7 @@ class Proto : public NonCopyable void sendStr (char command, const char *str, int size, bool reliable = true); /// permet d'envoyer un packet robert - void Proto::sendUnreliable (char command, const char *format, int a0, + void sendUnreliable (char command, const char *format, int a0, int a1, int a2, int a3, int a4, int a5); //@{ /// Teste si le packet correspond au format et décode les valeurs. Utilise -- cgit v1.2.3