# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1222252230 0
# Node ID b26170e168d9359e08617e53be06cf0b600a3aaa
# Parent  a40e9b3e9e629ac7d0a69080ba80a9e78884e534
merge -c1452 trunk: Headers.

diff -r a40e9b3e9e62 -r b26170e168d9 NEWS
--- a/NEWS	Wed Sep 24 08:52:21 2008 +0000
+++ b/NEWS	Wed Sep 24 10:30:30 2008 +0000
@@ -10,6 +10,7 @@
   mailbox protocols.
 * The Sdo Information Service is only queried, if the slave has the
   corresponding SII bit set.
+* Added some missing header files in the command-line-tool code.
 
 Changes in version 1.4.0-rc2:
 
diff -r a40e9b3e9e62 -r b26170e168d9 tool/CommandSlaves.cpp
--- a/tool/CommandSlaves.cpp	Wed Sep 24 08:52:21 2008 +0000
+++ b/tool/CommandSlaves.cpp	Wed Sep 24 10:30:30 2008 +0000
@@ -7,6 +7,7 @@
 #include <iostream>
 #include <iomanip>
 #include <list>
+#include <string.h>
 using namespace std;
 
 #include "CommandSlaves.h"
diff -r a40e9b3e9e62 -r b26170e168d9 tool/CommandStates.cpp
--- a/tool/CommandStates.cpp	Wed Sep 24 08:52:21 2008 +0000
+++ b/tool/CommandStates.cpp	Wed Sep 24 10:30:30 2008 +0000
@@ -5,6 +5,7 @@
  ****************************************************************************/
 
 #include <iostream>
+#include <algorithm>
 using namespace std;
 
 #include "CommandStates.h"
diff -r a40e9b3e9e62 -r b26170e168d9 tool/CommandXml.cpp
--- a/tool/CommandXml.cpp	Wed Sep 24 08:52:21 2008 +0000
+++ b/tool/CommandXml.cpp	Wed Sep 24 10:30:30 2008 +0000
@@ -6,6 +6,7 @@
 
 #include <iostream>
 #include <iomanip>
+#include <string.h>
 using namespace std;
 
 #include "CommandXml.h"
diff -r a40e9b3e9e62 -r b26170e168d9 tool/MasterDevice.cpp
--- a/tool/MasterDevice.cpp	Wed Sep 24 08:52:21 2008 +0000
+++ b/tool/MasterDevice.cpp	Wed Sep 24 10:30:30 2008 +0000
@@ -8,6 +8,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <sys/ioctl.h>
+#include <string.h>
 
 #include <sstream>
 #include <iomanip>
diff -r a40e9b3e9e62 -r b26170e168d9 tool/main.cpp
--- a/tool/main.cpp	Wed Sep 24 08:52:21 2008 +0000
+++ b/tool/main.cpp	Wed Sep 24 10:30:30 2008 +0000
@@ -6,6 +6,7 @@
 
 #include <getopt.h>
 #include <libgen.h> // basename()
+#include <stdlib.h>
 
 #include <iostream>
 #include <iomanip>