Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
@@ -79,7 +79,7 @@ bool ExecProcess(NamedPipe& pipe, CmdMessage& cmd)
Token utoken;
if(*cmd.username)
{
- CHAR *username, *domain;
+ char *username, *domain;
if(username=strchr(cmd.username,'\\'))
*username++=0;
@@ -75,12 +75,12 @@ struct CmdMessage
return buf;
}
- CHAR command[16];
+ char command[16];
DWORD processId;
DWORD threadId;
- CHAR machine[MAX_COMPUTERNAME_LENGTH+1];
- CHAR username[UNLEN+1];
- CHAR password[PWLEN+1];
+ char machine[MAX_COMPUTERNAME_LENGTH+1];
+ char username[UNLEN+1];
+ char password[PWLEN+1];
};
@@ -340,7 +340,6 @@ typedef int socklen_t;
//#define bool unsigned char
#define BOOL bool
#define UINT unsigned int
-#define CHAR char
#define DWORD unsigned long
#define VOID void
#define LPBYTE char *
@@ -4042,7 +4042,7 @@ private:
- void ConvertCToW(unsigned short* pszDest, const CHAR* pszSrc)
+ void ConvertCToW(unsigned short* pszDest, const char * pszSrc)
unsigned i = 0;
for(i = 0; i < strlen(pszSrc); i++)