summaryrefslogtreecommitdiffstats
path: root/Utilities/cmcurl/lib/conncache.c
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-12-05 16:50:43 (GMT)
committerBrad King <brad.king@kitware.com>2016-12-05 16:50:43 (GMT)
commitf8a1ba202f51e70510f12f46fe0633ea908d5144 (patch)
treefe7f931cdb5c0049cd97660e3888a816dfd4a86f /Utilities/cmcurl/lib/conncache.c
parent25d7b1ca9d3a160850ad1f147ff96ac7c55f7d9f (diff)
parent93cc249f3dd7ecd621cd063e4c08bbdb54d971e8 (diff)
downloadCMake-f8a1ba202f51e70510f12f46fe0633ea908d5144.zip
CMake-f8a1ba202f51e70510f12f46fe0633ea908d5144.tar.gz
CMake-f8a1ba202f51e70510f12f46fe0633ea908d5144.tar.bz2
Merge branch 'upstream-curl' into update-curl
* upstream-curl: curl 2016-11-02 (3c561c65)
Diffstat (limited to 'Utilities/cmcurl/lib/conncache.c')
-rw-r--r--Utilities/cmcurl/lib/conncache.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/Utilities/cmcurl/lib/conncache.c b/Utilities/cmcurl/lib/conncache.c
index 32a7030..01b1b44 100644
--- a/Utilities/cmcurl/lib/conncache.c
+++ b/Utilities/cmcurl/lib/conncache.c
@@ -30,7 +30,6 @@
#include "progress.h"
#include "multiif.h"
#include "sendf.h"
-#include "rawstr.h"
#include "conncache.h"
/* The last 3 #include files should be in this order */
#include "curl_printf.h"
s="hl ppc"> #include "cmFLTKWrapUICommand.cxx" #include "cmGetDirectoryPropertyCommand.cxx" #include "cmGetTargetPropertyCommand.cxx" #include "cmGetTestPropertyCommand.cxx" #include "cmIncludeExternalMSProjectCommand.cxx" #include "cmInstallCommand.cxx" #include "cmInstallProgramsCommand.cxx" #include "cmLinkLibrariesCommand.cxx" #include "cmListCommand.cxx" #include "cmLoadCacheCommand.cxx" #include "cmMathCommand.cxx" #include "cmOutputRequiredFilesCommand.cxx" #include "cmQTWrapCPPCommand.cxx" #include "cmQTWrapUICommand.cxx" #include "cmRemoveCommand.cxx" #include "cmRemoveDefinitionsCommand.cxx" #include "cmSeparateArgumentsCommand.cxx" #include "cmSetDirectoryPropertiesCommand.cxx" #include "cmSetTargetPropertiesCommand.cxx" #include "cmSetTestsPropertiesCommand.cxx" #include "cmSourceGroupCommand.cxx" #include "cmSubdirDependsCommand.cxx" #include "cmUseMangledMesaCommand.cxx" #include "cmUtilitySourceCommand.cxx" #include "cmVTKMakeInstantiatorCommand.cxx" #include "cmVTKWrapJavaCommand.cxx" #include "cmVTKWrapPythonCommand.cxx" #include "cmVTKWrapTclCommand.cxx" #include "cmVariableRequiresCommand.cxx" #include "cmWhileCommand.cxx" #include "cmWriteFileCommand.cxx" // This one must be last because it includes windows.h and // windows.h #defines GetCurrentDirectory which is a member // of cmMakefile #include "cmLoadCommandCommand.cxx" #endif void GetPredefinedCommands(std::list<cmCommand*>& #if defined(CMAKE_BUILD_WITH_CMAKE) commands #endif ) { #if defined(CMAKE_BUILD_WITH_CMAKE) commands.push_back(new cmAddSubDirectoryCommand); commands.push_back(new cmAuxSourceDirectoryCommand); commands.push_back(new cmBuildNameCommand); commands.push_back(new cmCreateTestSourceList); commands.push_back(new cmEnableLanguageCommand); commands.push_back(new cmEndWhileCommand); commands.push_back(new cmExecuteProcessCommand); commands.push_back(new cmExportLibraryDependenciesCommand); commands.push_back(new cmFLTKWrapUICommand); commands.push_back(new cmGetDirectoryPropertyCommand); commands.push_back(new cmGetTargetPropertyCommand); commands.push_back(new cmGetTestPropertyCommand); commands.push_back(new cmIncludeExternalMSProjectCommand); commands.push_back(new cmInstallCommand); commands.push_back(new cmInstallProgramsCommand); commands.push_back(new cmLinkLibrariesCommand); commands.push_back(new cmListCommand); commands.push_back(new cmLoadCacheCommand); commands.push_back(new cmLoadCommandCommand); commands.push_back(new cmMathCommand); commands.push_back(new cmOutputRequiredFilesCommand); commands.push_back(new cmQTWrapCPPCommand); commands.push_back(new cmQTWrapUICommand); commands.push_back(new cmRemoveCommand); commands.push_back(new cmRemoveDefinitionsCommand); commands.push_back(new cmSeparateArgumentsCommand); commands.push_back(new cmSetDirectoryPropertiesCommand); commands.push_back(new cmSetTargetPropertiesCommand); commands.push_back(new cmSetTestsPropertiesCommand); commands.push_back(new cmSourceGroupCommand); commands.push_back(new cmSubdirDependsCommand); commands.push_back(new cmUseMangledMesaCommand); commands.push_back(new cmUtilitySourceCommand); commands.push_back(new cmVTKMakeInstantiatorCommand); commands.push_back(new cmVTKWrapJavaCommand); commands.push_back(new cmVTKWrapPythonCommand); commands.push_back(new cmVTKWrapTclCommand); commands.push_back(new cmVariableRequiresCommand); commands.push_back(new cmWhileCommand); commands.push_back(new cmWriteFileCommand); #endif }