From 290a31c69285228c2f537aff6b6e8663eb2b0284 Mon Sep 17 00:00:00 2001
From: Colin Finck <colin@reactos.org>
Date: Sat, 18 Oct 2008 20:49:00 +0000
Subject: [PATCH] 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
---
 reactos/base/applications/network/telnet/src/tkeymap.h   | 4 ++--
 reactos/base/applications/network/telnet/src/tmapldr.cpp | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/reactos/base/applications/network/telnet/src/tkeymap.h b/reactos/base/applications/network/telnet/src/tkeymap.h
index 01258fe5307..0501c20fbb9 100644
--- 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 16aae9308c1..e642fc56e80 100644
--- 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
-- 
2.17.1