diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-10-13 14:52:34 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-10-13 14:52:34 (GMT) |
| commit | 72b38e3aa7ba5fa4a70144e05de36bc99fda173a (patch) | |
| tree | 744005aab47678a2a742267a01799a8f53dd0cf7 /Utilities/cmxmlrpc | |
| parent | 8883613cc022d0ae2c96d84adf79dd82b74df658 (diff) | |
| download | CMake-72b38e3aa7ba5fa4a70144e05de36bc99fda173a.zip CMake-72b38e3aa7ba5fa4a70144e05de36bc99fda173a.tar.gz CMake-72b38e3aa7ba5fa4a70144e05de36bc99fda173a.tar.bz2 | |
ENH: merge changes from the main tree to the 2.4 branch
Diffstat (limited to 'Utilities/cmxmlrpc')
| -rw-r--r-- | Utilities/cmxmlrpc/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Utilities/cmxmlrpc/xmlrpc_curl_transport.c | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Utilities/cmxmlrpc/CMakeLists.txt b/Utilities/cmxmlrpc/CMakeLists.txt index 2d96d50..a29e0bd 100644 --- a/Utilities/cmxmlrpc/CMakeLists.txt +++ b/Utilities/cmxmlrpc/CMakeLists.txt @@ -2,6 +2,11 @@ PROJECT(XMLRPC) INCLUDE_REGULAR_EXPRESSION("^.*$") +# Disable warnings on Borland to avoid changing 3rd party code. +IF(BORLAND) + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w-") +ENDIF(BORLAND) + # Include all the necessary files for macros SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake") diff --git a/Utilities/cmxmlrpc/xmlrpc_curl_transport.c b/Utilities/cmxmlrpc/xmlrpc_curl_transport.c index 1190908..15477ce 100644 --- a/Utilities/cmxmlrpc/xmlrpc_curl_transport.c +++ b/Utilities/cmxmlrpc/xmlrpc_curl_transport.c @@ -589,7 +589,10 @@ rpcCreate(xmlrpc_env * const envP, destroyCurlTransaction(rpcP->curlTransactionP); } if (envP->fault_occurred) - free(rpcP); + { + free(rpcP); + rpcP = 0; /* set this to null as it is used later on */ + } } *rpcPP = rpcP; } |