summaryrefslogtreecommitdiffstats
path: root/Source/kwsys/ProcessUNIX.c
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-01-10 17:09:04 (GMT)
committerBrad King <brad.king@kitware.com>2015-01-10 17:09:04 (GMT)
commite5b914209742a70c72c6cf8a8e6e1e005d8830f2 (patch)
tree3e82e13ca173bf5903d4c1235278cf6f1496a83c /Source/kwsys/ProcessUNIX.c
parent4aa9c64511adb6e3aa1b686d07f8cbdf92dedbab (diff)
parent54d83caecfc1e0b8f047037ea6aaa7d54b64d8b3 (diff)
downloadCMake-e5b914209742a70c72c6cf8a8e6e1e005d8830f2.zip
CMake-e5b914209742a70c72c6cf8a8e6e1e005d8830f2.tar.gz
CMake-e5b914209742a70c72c6cf8a8e6e1e005d8830f2.tar.bz2
Merge branch 'upstream-kwsys' into update-kwsys
Diffstat (limited to 'Source/kwsys/ProcessUNIX.c')
-rw-r--r--Source/kwsys/ProcessUNIX.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/kwsys/ProcessUNIX.c b/Source/kwsys/ProcessUNIX.c
index ca9d424..1be6d02 100644
--- a/Source/kwsys/ProcessUNIX.c
+++ b/Source/kwsys/ProcessUNIX.c
@@ -547,7 +547,7 @@ int kwsysProcess_SetPipeFile(kwsysProcess* cp, int prPipe, const char* file)
}
if(file)
{
- *pfile = malloc(strlen(file)+1);
+ *pfile = (char*)malloc(strlen(file)+1);
if(!*pfile)
{
return 0;
@@ -1468,7 +1468,7 @@ static int kwsysProcessInitialize(kwsysProcess* cp)
cp->RealWorkingDirectoryLength = 4096;
#endif
cp->RealWorkingDirectory =
- malloc((size_t)(cp->RealWorkingDirectoryLength));
+ (char*)malloc((size_t)(cp->RealWorkingDirectoryLength));
if(!cp->RealWorkingDirectory)
{
return 0;