Merge branch 'upstream-kwsys' into update-kwsys

This commit is contained in:
Brad King 2015-10-06 10:32:55 -04:00
commit d0c3bf65d5
2 changed files with 3 additions and 2 deletions

View File

@ -38,6 +38,7 @@
// Windows API. // Windows API.
#if defined(_WIN32) #if defined(_WIN32)
# include <windows.h> # include <windows.h>
# include <shellapi.h>
#endif #endif
namespace KWSYS_NAMESPACE namespace KWSYS_NAMESPACE

View File

@ -703,13 +703,13 @@ public:
/** /**
* Create a symbolic link if the platform supports it. Returns whether * Create a symbolic link if the platform supports it. Returns whether
* creation succeded. * creation succeeded.
*/ */
static bool CreateSymlink(const std::string& origName, const std::string& newName); static bool CreateSymlink(const std::string& origName, const std::string& newName);
/** /**
* Read the contents of a symbolic link. Returns whether reading * Read the contents of a symbolic link. Returns whether reading
* succeded. * succeeded.
*/ */
static bool ReadSymlink(const std::string& newName, std::string& origName); static bool ReadSymlink(const std::string& newName, std::string& origName);