[ros-diffs] [turner] 18551: remove more __REACTOS__ checks / unused code. I left WIN32_LEAN_AND_MEAN defined at all times. If this causes problems feel free to remove it.

remove more __REACTOS__ checks / unused code.  I left
WIN32_LEAN_AND_MEAN defined at all times.  If this causes problems feel
free to remove it.
Modified: trunk/reactos/subsys/system/cmd/cmd.c
Modified: trunk/reactos/subsys/system/cmd/config.h
  _____  

Modified: trunk/reactos/subsys/system/cmd/cmd.c
--- trunk/reactos/subsys/system/cmd/cmd.c	2005-10-18 04:23:50 UTC
(rev 18550)
+++ trunk/reactos/subsys/system/cmd/cmd.c	2005-10-18 12:25:31 UTC
(rev 18551)
@@ -1648,25 +1648,7 @@

 	{
 		ParseCommandLine (_T("\\cmdstart.bat"));
 	}
-#ifndef __REACTOS__
-	else
-	{
-		/* try to run cmdstart.bat from install dir */
-		LPTSTR p;
 
-		_tcscpy (commandline, argv[0]);
-		p = _tcsrchr (commandline, _T('\\')) + 1;
-		_tcscpy (p, _T("cmdstart.bat"));
-
-		if (IsExistingFile (_T("commandline")))
-		{
-			LoadString(CMD_ModuleHandle, STRING_CMD_ERROR4,
szMsg, RC_STRING_MAX_SIZE);
-			ConErrPrintf(szMsg, commandline);
-			ParseCommandLine (commandline);
-		}
-	}
-#endif
-
 #ifdef FEATURE_DIR_STACK
 	/* initialize directory stack */
 	InitDirectoryStack ();
@@ -1692,10 +1674,6 @@
 
 static VOID Cleanup (int argc, TCHAR *argv[])
 {
-#ifndef __REACTOS__
-	TCHAR szMsg[RC_STRING_MAX_SIZE];
-#endif
-
 	/* run cmdexit.bat */
 	if (IsExistingFile (_T("cmdexit.bat")))
 	{
@@ -1708,26 +1686,7 @@
 		ConErrResPuts (STRING_CMD_ERROR5);
 		ParseCommandLine (_T("\\cmdexit.bat"));
 	}
-#ifndef __REACTOS__
-	else
-	{
-		/* try to run cmdexit.bat from install dir */
-		TCHAR commandline[CMDLINE_LENGTH];
-		LPTSTR p;
 
-		_tcscpy (commandline, argv[0]);
-		p = _tcsrchr (commandline, _T('\\')) + 1;
-		_tcscpy (p, _T("cmdexit.bat"));
-
-		if (IsExistingFile (_T("commandline")))
-		{
-			LoadString(CMD_ModuleHandle, STRING_CMD_ERROR4,
szMsg, RC_STRING_MAX_SIZE);
-			ConErrPrintf(szMsg, commandline);
-			ParseCommandLine (commandline);
-		}
-	}
-#endif
-
 #ifdef FEATURE_ALIASES
 	DestroyAlias ();
 #endif
  _____  

Modified: trunk/reactos/subsys/system/cmd/config.h
--- trunk/reactos/subsys/system/cmd/config.h	2005-10-18 04:23:50 UTC
(rev 18550)
+++ trunk/reactos/subsys/system/cmd/config.h	2005-10-18 12:25:31 UTC
(rev 18551)
@@ -15,15 +15,10 @@

 #ifndef _CONFIG_H_INCLUDED_
 #define _CONFIG_H_INCLUDED_
 
-
-#ifndef __REACTOS__
-#define WIN32_LEAN_AND_MEAN
-#endif /* __REACTOS__ */
-
-
 /* Define to enable debugging code */
 //#define _DEBUG
 
+#define WIN32_LEAN_AND_MEAN
 
 /* Define to enable the alias command, and aliases.*/
 #define FEATURE_ALIASES