[ros-diffs] [cfinck] 36812: Marcelo Slomp (mslomp at linuxmail.org): - Prevent a redefinition of _pctype in newer GCC versions (like 4.3.2) See issue #3598 for more details.

[cfinck at svn.reactos.org]

Author: cfinck
Date: Sat Oct 18 15:49:00 2008
New Revision: 36812

URL: http://svn.reactos.org/svn/reactos?rev=36812&view=rev
Log:
Marcelo Slomp (mslomp at linuxmail.org):
- Prevent a redefinition of _pctype in newer GCC versions (like 4.3.2)

See issue #3598 for more details.

Modified:
    trunk/reactos/base/applications/network/telnet/src/tkeymap.h
    trunk/reactos/base/applications/network/telnet/src/tmapldr.cpp

Modified: trunk/reactos/base/applications/network/telnet/src/tkeymap.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/telnet/src/tkeymap.h?rev=36812&r1=36811&r2=36812&view=diff
==============================================================================
--- trunk/reactos/base/applications/network/telnet/src/tkeymap.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/telnet/src/tkeymap.h [iso-8859-1] Sat Oct 18 15:49:00 2008
@@ -1,5 +1,7 @@
 #ifndef __TKEYMAP_H
 #define __TKEYMAP_H
+
+#include "tkeydef.h"
 
 #ifdef __BORLANDC__
 #include <classlib\arrays.h>
@@ -7,8 +9,6 @@
 #include <string>
 #include "stl_bids.h"
 #endif
-
-#include "tkeydef.h"
 
 //AVS
 typedef TArrayAsVector<TKeyDef> keyArray;

Modified: trunk/reactos/base/applications/network/telnet/src/tmapldr.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/telnet/src/tmapldr.cpp?rev=36812&r1=36811&r2=36812&view=diff
==============================================================================
--- trunk/reactos/base/applications/network/telnet/src/tmapldr.cpp [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/telnet/src/tmapldr.cpp [iso-8859-1] Sat Oct 18 15:49:00 2008
@@ -29,16 +29,15 @@
 //     originally part of KeyTrans.cpp                 //
 /////////////////////////////////////////////////////////
 
+#include "tmapldr.h"
+#include "tnconfig.h"
+
 #ifdef __BORLANDC__
 #include <fstream.h>
 #else
 #include <string>
 #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)