Browse Source

HPCC-19775 Fix windows 64 bit build problems

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Gavin Halliday 7 years ago
parent
commit
1f9ba3cb74

+ 1 - 1
common/monitoring/prosysinfo/main.cpp

@@ -126,7 +126,7 @@ int main(int argc, char** argv)
     //Physical and virtual memory usage.
     MEMORYSTATUS memstatus;
     GlobalMemoryStatus(&memstatus);
-    printf("Physical Memory: %d %d\nVirtual Memory: %d %d\n", 
+    printf("Physical Memory: %zu %zu\nVirtual Memory: %zu %zu\n",
         (memstatus.dwTotalPhys - memstatus.dwAvailPhys)/1024, memstatus.dwAvailPhys/1024,
         (memstatus.dwTotalVirtual - memstatus.dwAvailVirtual)/1024, memstatus.dwAvailVirtual/1024);
 

+ 1 - 1
ecl/hqlcpp/hqlcpp.cpp

@@ -12039,7 +12039,7 @@ void HqlCppTranslator::buildScriptFunctionDefinition(BuildCtx &ctx, IHqlExpressi
                 args.append(*createActualFromFormal(queryParam));
             else
                 args.append(*LINK(bodyCode->queryChild(0)));
-            args.append(*createConstant(createUtf8Value(fieldlist.length()-1, fieldlist+1, makeUtf8Type(UNKNOWN_LENGTH, NULL))));
+            args.append(*createConstant(createUtf8Value(fieldlist.length()-1, fieldlist.str()+1, makeUtf8Type(UNKNOWN_LENGTH, NULL))));
             args.append(*LINK(substSearch));
             scriptArgs.append(*bindFunctionCall(substituteEmbeddedScriptId, args,makeUtf8Type(UNKNOWN_LENGTH, NULL)));
         }

+ 1 - 1
system/jlib/jfile.cpp

@@ -5249,7 +5249,7 @@ StringBuffer &makeAbsolutePath(const char *relpath, const char *basedir, StringB
 const char *splitRelativePath(const char *full,const char *basedir,StringBuffer &reldir)
 {
     if (basedir&&*basedir) {
-        size32_t bl = strlen(basedir);
+        size_t bl = strlen(basedir);
         if (isPathSepChar(basedir[bl-1]))
             bl--;
         if ((memicmp(full,basedir,bl)==0)&&isPathSepChar(full[bl]))

+ 2 - 2
system/jlib/jprop.cpp

@@ -305,8 +305,8 @@ public:
                 if (*val)
                 {
                     char * str = mapping->detach();
-                    unsigned len1 = strlen(str);
-                    unsigned len2 = strlen(val);
+                    size_t len1 = strlen(str);
+                    size_t len2 = strlen(val);
                     char * newstr = (char *)realloc(str, len1 + len2+1);
                     assertex(newstr);
                     memcpy(newstr+len1, val, len2);

+ 1 - 1
system/security/securesocket/securesocket.cpp

@@ -1710,7 +1710,7 @@ public:
             // secure_connect may also DBGLOG() errors ...
             ssock->secure_connect();
         }
-        catch (IException *e)
+        catch (IException *)
         {
             ss->status = false;
             throw;

+ 1 - 1
system/win32/win32.hpp

@@ -88,7 +88,7 @@ public:
             LPVOID msg=0;
             if(::FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &msg, 0, NULL) && msg)
             {
-                int len=_tcslen(buf);
+                size_t len=_tcslen(buf);
                 if(len<arraysize(buf)-1)
                     _sntprintf(buf+len,arraysize(buf)-1-len,TEXT(" - (%d) %s"),code,(const char *)msg);
                 ::LocalFree(msg);