Bladeren bron

HPCC-13147 Build errors on Windows 64 bit

When building windows 64 bit, there are several simple compile errors.
jdebug.cpp line 895 (GetProcessAffinityMask)
ldapconnection.cpp 2747,2751,2753 (ConvertCToW)
This PR fixes the ones in JLIB and esphttp lib

Signed-off-by: William Whitehead <william.whitehead@lexisnexis.com>
William Whitehead 10 jaren geleden
bovenliggende
commit
40616ecb66
2 gewijzigde bestanden met toevoegingen van 4 en 4 verwijderingen
  1. 1 1
      system/jlib/jdebug.cpp
  2. 3 3
      system/security/LdapSecurity/ldapconnection.cpp

+ 1 - 1
system/jlib/jdebug.cpp

@@ -892,7 +892,7 @@ unsigned getAffinityCpus()
 {
 {
     unsigned numCpus = 0;
     unsigned numCpus = 0;
     DWORD ProcessAffinityMask, SystemAffinityMask;
     DWORD ProcessAffinityMask, SystemAffinityMask;
-    if (GetProcessAffinityMask(GetCurrentProcess(), &ProcessAffinityMask, &SystemAffinityMask))
+    if (GetProcessAffinityMask(GetCurrentProcess(), (PDWORD_PTR)&ProcessAffinityMask, (PDWORD_PTR)&SystemAffinityMask))
     {
     {
         unsigned i = 0;
         unsigned i = 0;
         while (ProcessAffinityMask)
         while (ProcessAffinityMask)

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

@@ -2745,12 +2745,12 @@ public:
             m_ldapconfig->getLdapHost(server);
             m_ldapconfig->getLdapHost(server);
             fullserver.append(server.str());
             fullserver.append(server.str());
             LPWSTR whost = (LPWSTR)alloca((fullserver.length() +1) * sizeof(WCHAR));
             LPWSTR whost = (LPWSTR)alloca((fullserver.length() +1) * sizeof(WCHAR));
-            ConvertCToW(whost, fullserver.str());
+            ConvertCToW((unsigned short *)whost, fullserver.str());
 
 
             LPWSTR wusername = (LPWSTR)alloca((strlen(username) + 1) * sizeof(WCHAR));
             LPWSTR wusername = (LPWSTR)alloca((strlen(username) + 1) * sizeof(WCHAR));
-            ConvertCToW(wusername, username);
+            ConvertCToW((unsigned short *)wusername, username);
             LPWSTR wnewpasswd = (LPWSTR)alloca((strlen(newPassword) + 1) * sizeof(WCHAR));
             LPWSTR wnewpasswd = (LPWSTR)alloca((strlen(newPassword) + 1) * sizeof(WCHAR));
-            ConvertCToW(wnewpasswd, newPassword);
+            ConvertCToW((unsigned short *)wnewpasswd, newPassword);
             usriSetPassword.usri1003_password  = wnewpasswd;
             usriSetPassword.usri1003_password  = wnewpasswd;
             nStatus = NetUserSetInfo(whost, wusername,  1003, (LPBYTE)&usriSetPassword, NULL);
             nStatus = NetUserSetInfo(whost, wusername,  1003, (LPBYTE)&usriSetPassword, NULL);