Browse Source

HPCC-23751 Fix additional problem with windows builds

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Gavin Halliday 5 years ago
parent
commit
1c0fc0a004
2 changed files with 4 additions and 4 deletions
  1. 3 3
      esp/platform/espp.cpp
  2. 1 1
      system/jlib/jfile.cpp

+ 3 - 3
esp/platform/espp.cpp

@@ -124,7 +124,7 @@ bool CEspServer::isSubscribedToDali()
 
 #ifdef ESP_SINGLE_PROCESS
 
-int start_init_main(int argc, char** argv, int (*init_main_func)(int,char**))
+int start_init_main(int argc, const char** argv, int (*init_main_func)(int,const char**))
 {
     return init_main_func(argc, argv);
 }
@@ -138,11 +138,11 @@ int start_init_main(int argc, char** argv, int (*init_main_func)(int,char**))
 #define SET_ESP_SIGNAL_HANDLER(sig, handler)
 #define RESET_ESP_SIGNAL_HANDLER(sig, handler)
 
-int start_init_main(int argc, char** argv, int (*init_main_func)(int, char**))
+int start_init_main(int argc, const char** argv, int (*init_main_func)(int, const char**))
 { 
     if(argc > 1 && !strcmp(argv[1], "work")) 
     { 
-        char** newargv = new char*[argc - 1]; 
+        const char** newargv = new const char*[argc - 1];
         newargv[0] = argv[0]; 
         for(int i = 2; i < argc; i++) 
         { 

+ 1 - 1
system/jlib/jfile.cpp

@@ -1218,7 +1218,7 @@ static CriticalSection connectcrit;
 static bool connectToExternalDrive(const char * const filename)
 {
 #if 0
-    //The following code used the passowrdProvider.  Retained in case similar code is needed in the future.
+    //The following code used the passwordProvider.  Retained in case similar code is needed in the future.
     CriticalBlock block(connectcrit);
     if (!passwordProvider)
         return false;