فهرست منبع

Fix borland build. Borland Run command should be static, since it is called with no object...

Andy Cedilnik 23 سال پیش
والد
کامیت
1ba0a05039
2فایلهای تغییر یافته به همراه5 افزوده شده و 4 حذف شده
  1. 2 1
      Source/cmSystemTools.cxx
  2. 3 3
      Source/cmWin32ProcessExecution.h

+ 2 - 1
Source/cmSystemTools.cxx

@@ -1273,7 +1273,8 @@ bool RunCommandViaWin32(const char* command,
                         int timeout)
 {
 #if defined(__BORLANDC__)
-  return cmWin32ProcessExecution::BorlandRunCommand(command, dir, output, retVal, 
+  return cmWin32ProcessExecution::BorlandRunCommand(command, dir, output, 
+                                                    retVal, 
                                                     verbose, timeout);
 #else // Visual studio
   ::SetLastError(ERROR_SUCCESS);

+ 3 - 3
Source/cmWin32ProcessExecution.h

@@ -132,9 +132,9 @@ public:
    * will display it in our app. Consequently, we check for input in
    * our app and send it off to the write end of the stdin pipe.
    */ 
-  bool BorlandRunCommand(const char* command, const char* dir, 
-                         std::string& output, int& retVal, bool verbose,
-                         int timeout);
+  static bool BorlandRunCommand(const char* command, const char* dir, 
+                                std::string& output, int& retVal, bool verbose,
+                                int timeout);
 
 private:
   bool PrivateOpen(const char*, const char*, int, int);