瀏覽代碼

HPCC-11874 Remove #define CHAR from the sources

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Gavin Halliday 11 年之前
父節點
當前提交
8b931c6d87

+ 1 - 1
services/winremote/service/svcexec.cpp

@@ -79,7 +79,7 @@ bool ExecProcess(NamedPipe& pipe, CmdMessage& cmd)
         Token utoken;
         Token utoken;
         if(*cmd.username)
         if(*cmd.username)
         { 
         { 
-            CHAR *username, *domain;
+            char *username, *domain;
             if(username=strchr(cmd.username,'\\'))
             if(username=strchr(cmd.username,'\\'))
             {
             {
                 *username++=0;
                 *username++=0;

+ 4 - 4
services/winremote/service/svcmsg.hpp

@@ -75,12 +75,12 @@ struct CmdMessage
         return buf;
         return buf;
     } 
     } 
 
 
-    CHAR  command[16];
+    char  command[16];
     DWORD processId;
     DWORD processId;
     DWORD threadId;
     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];
 
 
 };
 };
 
 

+ 0 - 1
system/include/platform.h

@@ -340,7 +340,6 @@ typedef int socklen_t;
 //#define bool  unsigned char
 //#define bool  unsigned char
 #define BOOL    bool
 #define BOOL    bool
 #define UINT    unsigned int
 #define UINT    unsigned int
-#define CHAR    char
 #define DWORD   unsigned long
 #define DWORD   unsigned long
 #define VOID    void
 #define VOID    void
 #define LPBYTE  char *
 #define LPBYTE  char *

+ 1 - 1
system/security/LdapSecurity/ldapconnection.cpp

@@ -4042,7 +4042,7 @@ private:
         }
         }
     }
     }
 
 
-    void ConvertCToW(unsigned short* pszDest, const CHAR* pszSrc)
+    void ConvertCToW(unsigned short* pszDest, const char * pszSrc)
     {
     {
         unsigned i = 0;
         unsigned i = 0;
         for(i = 0; i < strlen(pszSrc); i++)
         for(i = 0; i < strlen(pszSrc); i++)