[akhaldi] 61561: [TELNET] * Move the main header up one level. * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. * Cleanup the ma...
Author: akhaldi Date: Tue Jan 7 17:03:47 2014 New Revision: 61561
URL: http://svn.reactos.org/svn/reactos?rev=61561&view=rev Log: [TELNET] * Move the main header up one level. * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. * Cleanup the main header. CORE-7716
Added: trunk/reactos/base/applications/network/telnet/precomp.h - copied, changed from r61451, trunk/reactos/base/applications/network/telnet/src/precomp.h Removed: trunk/reactos/base/applications/network/telnet/src/precomp.h Modified: trunk/reactos/base/applications/network/telnet/src/ansiprsr.cpp trunk/reactos/base/applications/network/telnet/src/ansiprsr.h trunk/reactos/base/applications/network/telnet/src/tnconfig.cpp trunk/reactos/base/applications/network/telnet/src/tnerror.cpp trunk/reactos/base/applications/network/telnet/src/tnerror.h trunk/reactos/base/applications/network/telnet/src/tnmain.cpp trunk/reactos/base/applications/network/telnet/src/tscript.cpp trunk/reactos/base/applications/network/telnet/src/ttelhndl.cpp
Copied: trunk/reactos/base/applications/network/telnet/precomp.h (from r61451, trunk/reactos/base/applications/network/telnet/src/precomp.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/t... ============================================================================== --- trunk/reactos/base/applications/network/telnet/src/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/precomp.h [iso-8859-1] Tue Jan 7 17:03:47 2014 @@ -1,47 +1,29 @@ -#include "ansiprsr.h" +#include <stdarg.h> + +#define WIN32_NO_STATUS + +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <wincon.h> +#define _INC_WINDOWS +#include <winsock.h>
#if defined(__BORLANDC__) && (__BORLANDC < 0x0500) #include <mem.h> -//#else -//#include <memory.h> #endif
#ifdef __BORLANDC__ #include <fstream.h> #else -//#include <string> #include <fstream> #endif
-//#include <windows.h> -//#include <stdlib.h> -//#include <stdio.h> -//#include <stdarg.h> -//#include <string.h> -#include <locale.h> -#include <io.h> -#include <time.h> -//#include <ctype.h> -//#include <sys/types.h> -#include <sys/stat.h> - -//#include "keytrans.h" -//#include "tnerror.h" -//#include "tcharmap.h" -//#include "tnconfig.h" -//#include "tconsole.h" -//#include "tkeydef.h" -//#include "tkeymap.h" -#include "tmapldr.h" -//#include "tmouse.h" -#include "tnclass.h" -#include "tnmisc.h" -//#include "tnclip.h" -#include "tncon.h" -//#include "ttelhndl.h" -//#include "tnetwork.h" -#include "tnmain.h" -#include "tscript.h" -//#include "tscroll.h" -#include "telnet.h" -//#include "tparams.h" +#include "src/tnconfig.h" +#include "src/tnmsg.h" +#include "src/tparser.h" +#include "src/ansiprsr.h" +#include "src/tmapldr.h" +#include "src/tnclass.h" +#include "src/tnmisc.h" +#include "src/tncon.h"
Modified: trunk/reactos/base/applications/network/telnet/src/ansiprsr.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/t... ============================================================================== --- trunk/reactos/base/applications/network/telnet/src/ansiprsr.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/src/ansiprsr.cpp [iso-8859-1] Tue Jan 7 17:03:47 2014 @@ -49,7 +49,6 @@ // ///////////////////////////////////////////////////////////////////////////////
-//#include <windows.h> #include "precomp.h"
const int ANSIColors[] = {BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE};
Modified: trunk/reactos/base/applications/network/telnet/src/ansiprsr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/t... ============================================================================== --- trunk/reactos/base/applications/network/telnet/src/ansiprsr.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/src/ansiprsr.h [iso-8859-1] Tue Jan 7 17:03:47 2014 @@ -1,11 +1,4 @@ #pragma once - -//#include <stdio.h> -//#include <stdlib.h> -//#include <ctype.h> -//#include <string.h> -#include "tnconfig.h" -#include "tparser.h"
// added this color table to make things go faster (Paul Branann 5/8/98) enum Colors {BLACK=0, BLUE, GREEN, CYAN, RED, MAGENTA, YELLOW, WHITE};
Removed: trunk/reactos/base/applications/network/telnet/src/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/t... ============================================================================== --- trunk/reactos/base/applications/network/telnet/src/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/src/precomp.h (removed) @@ -1,47 +0,0 @@ -#include "ansiprsr.h" - -#if defined(__BORLANDC__) && (__BORLANDC < 0x0500) -#include <mem.h> -//#else -//#include <memory.h> -#endif - -#ifdef __BORLANDC__ -#include <fstream.h> -#else -//#include <string> -#include <fstream> -#endif - -//#include <windows.h> -//#include <stdlib.h> -//#include <stdio.h> -//#include <stdarg.h> -//#include <string.h> -#include <locale.h> -#include <io.h> -#include <time.h> -//#include <ctype.h> -//#include <sys/types.h> -#include <sys/stat.h> - -//#include "keytrans.h" -//#include "tnerror.h" -//#include "tcharmap.h" -//#include "tnconfig.h" -//#include "tconsole.h" -//#include "tkeydef.h" -//#include "tkeymap.h" -#include "tmapldr.h" -//#include "tmouse.h" -#include "tnclass.h" -#include "tnmisc.h" -//#include "tnclip.h" -#include "tncon.h" -//#include "ttelhndl.h" -//#include "tnetwork.h" -#include "tnmain.h" -#include "tscript.h" -//#include "tscroll.h" -#include "telnet.h" -//#include "tparams.h"
Modified: trunk/reactos/base/applications/network/telnet/src/tnconfig.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/t... ============================================================================== --- trunk/reactos/base/applications/network/telnet/src/tnconfig.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/src/tnconfig.cpp [iso-8859-1] Tue Jan 7 17:03:47 2014 @@ -31,6 +31,10 @@ // see the file tnconfig.h for more information
#include "precomp.h" + +#include <locale.h> +#include <io.h> +#include <sys/stat.h>
// Turn off the "forcing value to bool 'true' or 'false'" warning #ifdef _MSC_VER
Modified: trunk/reactos/base/applications/network/telnet/src/tnerror.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/t... ============================================================================== --- trunk/reactos/base/applications/network/telnet/src/tnerror.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/src/tnerror.cpp [iso-8859-1] Tue Jan 7 17:03:47 2014 @@ -43,6 +43,8 @@ ///////////////////////////////////////////////////////////////////////////////
#include "precomp.h" + +#include <time.h>
#ifndef LANG_USER_DEFAULT #define LANG_USER_DEFAULT 400
Modified: trunk/reactos/base/applications/network/telnet/src/tnerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/t... ============================================================================== --- trunk/reactos/base/applications/network/telnet/src/tnerror.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/src/tnerror.h [iso-8859-1] Tue Jan 7 17:03:47 2014 @@ -1,17 +1,4 @@ #pragma once - -#ifndef __WINDOWS_H -#define WIN32_NO_STATUS -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <winuser.h> -#include <wincon.h> -#define _INC_WINDOWS -#include <winsock.h> -#endif - -#include "tnmsg.h"
extern int Telnet_Redir;
Modified: trunk/reactos/base/applications/network/telnet/src/tnmain.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/t... ============================================================================== --- trunk/reactos/base/applications/network/telnet/src/tnmain.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/src/tnmain.cpp [iso-8859-1] Tue Jan 7 17:03:47 2014 @@ -43,6 +43,8 @@ ///////////////////////////////////////////////////////////////////////////////
#include "precomp.h" + +#include "tnmain.h"
int telCommandLine (Telnet &MyConnection);
Modified: trunk/reactos/base/applications/network/telnet/src/tscript.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/t... ============================================================================== --- trunk/reactos/base/applications/network/telnet/src/tscript.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/src/tscript.cpp [iso-8859-1] Tue Jan 7 17:03:47 2014 @@ -24,6 +24,8 @@ ///////////////////////////////////////////////////////////////////////////
#include "precomp.h" + +#include "tscript.h"
// FIX ME!! This code not yet functional.
Modified: trunk/reactos/base/applications/network/telnet/src/ttelhndl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/t... ============================================================================== --- trunk/reactos/base/applications/network/telnet/src/ttelhndl.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/src/ttelhndl.cpp [iso-8859-1] Tue Jan 7 17:03:47 2014 @@ -39,6 +39,8 @@ ///////////////////////////////////////////////////////////////////////////////
#include "precomp.h" + +#include "telnet.h"
int naws_string(char *buf, int width, int height);
-
akhaldi＠svn.reactos.org