Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 10:35:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

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.

Browse source 
svn path=/trunk/; revision=18551
This commit is contained in:
Brandon Turner 2005-10-18 12:25:31 +00:00
parent 547d458153
commit b8674b8084
2 changed files with 1 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
reactos/subsys/system/cmd/cmd.c
View file

@ -1648,24 +1648,6 @@ Initialize (int argc, TCHAR* argv[])
{ {
ParseCommandLine (_T("\\cmdstart.bat")); 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 #ifdef FEATURE_DIR_STACK
/* initialize directory stack */ /* initialize directory stack */
@ -1692,10 +1674,6 @@ Initialize (int argc, TCHAR* argv[])
static VOID Cleanup (int argc, TCHAR *argv[]) static VOID Cleanup (int argc, TCHAR *argv[])
{ {
#ifndef __REACTOS__
TCHAR szMsg[RC_STRING_MAX_SIZE];
#endif
/* run cmdexit.bat */ /* run cmdexit.bat */
if (IsExistingFile (_T("cmdexit.bat"))) if (IsExistingFile (_T("cmdexit.bat")))
{ {
@ -1708,25 +1686,6 @@ static VOID Cleanup (int argc, TCHAR *argv[])
ConErrResPuts (STRING_CMD_ERROR5); ConErrResPuts (STRING_CMD_ERROR5);
ParseCommandLine (_T("\\cmdexit.bat")); 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 #ifdef FEATURE_ALIASES
DestroyAlias (); DestroyAlias ();

7
reactos/subsys/system/cmd/config.h
View file

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