Marcelo Slomp (mslomp@linuxmail.org):

- Prevent a redefinition of _pctype in newer GCC versions (like 4.3.2)

See issue #3598 for more details.

svn path=/trunk/; revision=36812

diff --git a/reactos/base/applications/network/telnet/src/tkeymap.h b/reactos/base/applications/network/telnet/src/tkeymap.h
index 01258fe..0501c20 100644 (file)
--- a/reactos/base/applications/network/telnet/src/tkeymap.h
+++ b/reactos/base/applications/network/telnet/src/tkeymap.h
@@ -1,6 +1,8 @@
 #ifndef __TKEYMAP_H
 #define __TKEYMAP_H
 
+#include "tkeydef.h"
+
 #ifdef __BORLANDC__
 #include <classlib\arrays.h>
 #else
@@ -8,8 +10,6 @@
 #include "stl_bids.h"
 #endif
 
-#include "tkeydef.h"
-
 //AVS
 typedef TArrayAsVector<TKeyDef> keyArray;
 

diff --git a/reactos/base/applications/network/telnet/src/tmapldr.cpp b/reactos/base/applications/network/telnet/src/tmapldr.cpp
index 16aae93..e642fc5 100644 (file)
--- a/reactos/base/applications/network/telnet/src/tmapldr.cpp
+++ b/reactos/base/applications/network/telnet/src/tmapldr.cpp
@@ -29,6 +29,9 @@
 //     originally part of KeyTrans.cpp                 //
 /////////////////////////////////////////////////////////
 
+#include "tmapldr.h"
+#include "tnconfig.h"
+
 #ifdef __BORLANDC__
 #include <fstream.h>
 #else
@@ -36,10 +39,6 @@
 #include <fstream>
 #endif
 
-#include "tmapldr.h"
-#include "tnerror.h"
-#include "tnconfig.h"
-
 // It's probably a good idea to turn off the "identifier was truncated" warning
 // in MSVC (Paul Brannan 5/25/98)
 #ifdef _MSC_VER