[cmake-commits] hoffman committed CMakeLists.txt 1.16 1.16.4.1 xmlrpc_curl_transport.c 1.13 1.13.6.1

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Utilities/cmxmlrpc
In directory public:/mounts/ram/cvs-serv31017/Utilities/cmxmlrpc

Modified Files:
      Tag: CMake-2-4
	CMakeLists.txt xmlrpc_curl_transport.c 
Log Message:
ENH: merge changes from the main tree to the 2.4 branch


Index: xmlrpc_curl_transport.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmxmlrpc/xmlrpc_curl_transport.c,v
retrieving revision 1.13
retrieving revision 1.13.6.1
diff -u -d -r1.13 -r1.13.6.1
--- xmlrpc_curl_transport.c	24 Jun 2005 13:06:26 -0000	1.13
+++ xmlrpc_curl_transport.c	13 Oct 2006 14:52:17 -0000	1.13.6.1
@@ -589,7 +589,10 @@
                     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;
 }

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmxmlrpc/CMakeLists.txt,v
retrieving revision 1.16
retrieving revision 1.16.4.1
diff -u -d -r1.16 -r1.16.4.1
--- CMakeLists.txt	12 Jul 2005 21:23:44 -0000	1.16
+++ CMakeLists.txt	13 Oct 2006 14:52:17 -0000	1.16.4.1
@@ -2,6 +2,11 @@
 
 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")