From: g0dil <g0dil@270642c3-0616-0410-b53a-bc976706d245>
Date: Wed, 27 Jan 2010 14:57:32 +0000 (+0000)
Subject: Utils/Console: Fix testServer build
X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=9e09a3d9a5f3f41ea7661771987faec068da1182;p=senf.git

Utils/Console: Fix testServer build
Utils/Termlib: Fix telnet negotiation breakage

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1551 270642c3-0616-0410-b53a-bc976706d245
---

diff --git a/senf/Utils/Console/testServer.cc b/senf/Utils/Console/testServer.cc
index 5d1a323..c18fe70 100644
--- a/senf/Utils/Console/testServer.cc
+++ b/senf/Utils/Console/testServer.cc
@@ -25,7 +25,7 @@
 
 // Custom includes
 #include <iostream>
-#include <senf/Console.hh>
+#include <senf/Utils/Console.hh>
 #include <senf/Scheduler/Scheduler.hh>
 
 namespace kw = senf::console::kw;
diff --git a/senf/Utils/Termlib/Telnet.hh b/senf/Utils/Termlib/Telnet.hh
index 7fb7eab..e127a95 100644
--- a/senf/Utils/Termlib/Telnet.hh
+++ b/senf/Utils/Termlib/Telnet.hh
@@ -259,23 +259,23 @@ namespace term {
         void timeout();
 
         enum Command { 
-            CMD_NONE = static_cast<char>(0),
-            CMD_SE = static_cast<char>(240),
-            CMD_NOP = static_cast<char>(241),
-            CMD_DM = static_cast<char>(242),
-            CMD_BRK = static_cast<char>(243),
-            CMD_IP = static_cast<char>(244),
-            CMD_AO = static_cast<char>(245),
-            CMD_AYT = static_cast<char>(246),
-            CMD_EC = static_cast<char>(247),
-            CMD_EL = static_cast<char>(248),
-            CMD_GA = static_cast<char>(249),
-            CMD_SB = static_cast<char>(250),
-            CMD_WILL = static_cast<char>(251),
-            CMD_WONT = static_cast<char>(252),
-            CMD_DO = static_cast<char>(253),
-            CMD_DONT = static_cast<char>(254),
-            CMD_IAC = static_cast<char>(255),
+            CMD_NONE = 0,
+            CMD_SE = 240,
+            CMD_NOP = 241,
+            CMD_DM = 242,
+            CMD_BRK = 243,
+            CMD_IP = 244,
+            CMD_AO = 245,
+            CMD_AYT = 246,
+            CMD_EC = 247,
+            CMD_EL = 248,
+            CMD_GA = 249,
+            CMD_SB = 250,
+            CMD_WILL = 251,
+            CMD_WONT = 252,
+            CMD_DO = 253,
+            CMD_DONT = 254,
+            CMD_IAC = 255,
         };
 
         struct OptInfo