fix compile error on win64.vs2010 platform
authorweizhenwei <weizhenwei1988@gmail.com>
Wed, 21 Jun 2017 07:43:41 +0000 (15:43 +0800)
committerweizhenwei <weizhenwei1988@gmail.com>
Wed, 21 Jun 2017 07:43:41 +0000 (15:43 +0800)
channels/rail/client/rail_main.c
channels/rail/client/rail_orders.c

index e24e0fb..ffcdcd6 100644 (file)
@@ -104,6 +104,7 @@ static UINT rail_client_execute(RailClientContext* context,
                                 RAIL_EXEC_ORDER* exec)
 {
        char* exeOrFile;
+       UINT error;
        railPlugin* rail = (railPlugin*) context->handle;
        exeOrFile = exec->RemoteApplicationProgram;
 
@@ -122,11 +123,11 @@ static UINT rail_client_execute(RailClientContext* context,
                                      &exec->workingDir); /* ShellWorkingDirectory */
        rail_string_to_unicode_string(exec->RemoteApplicationArguments,
                                      &exec->arguments); /* RemoteApplicationCmdLine */
-       UINT ret = rail_send_client_exec_order(rail, exec);
+       error = rail_send_client_exec_order(rail, exec);
        free(exec->exeOrFile.string);
        free(exec->workingDir.string);
        free(exec->arguments.string);
-       return ret;
+       return error;
 }
 
 /**
index 0a6abde..0cb6832 100644 (file)
@@ -650,9 +650,9 @@ UINT rail_order_recv(railPlugin* rail, wStream* s)
                case RDP_RAIL_ORDER_EXEC_RESULT:
                        {
                                RAIL_EXEC_RESULT_ORDER execResult;
-                               UINT ret = rail_recv_exec_result_order(rail, &execResult, s);
+                               error = rail_recv_exec_result_order(rail, &execResult, s);
                                free(execResult.exeOrFile.string);
-                               return ret;
+                               return error;
                        }
 
                case RDP_RAIL_ORDER_SYSPARAM: