aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--projects/Windows/VC10/src/curlsrc.tmpl4
-rw-r--r--projects/Windows/VC11/src/curlsrc.tmpl2
-rw-r--r--projects/Windows/VC12/src/curlsrc.tmpl2
-rw-r--r--projects/Windows/VC6/src/curlsrc.tmpl6
-rw-r--r--projects/Windows/VC7.1/src/curlsrc.tmpl6
-rw-r--r--projects/Windows/VC7/src/curlsrc.tmpl6
-rw-r--r--projects/Windows/VC8/src/curlsrc.tmpl6
-rw-r--r--projects/Windows/VC9/src/curlsrc.tmpl6
-rw-r--r--src/Makefile.inc2
9 files changed, 20 insertions, 20 deletions
diff --git a/projects/Windows/VC10/src/curlsrc.tmpl b/projects/Windows/VC10/src/curlsrc.tmpl
index 37f6ab8d7..1e8e4c2eb 100644
--- a/projects/Windows/VC10/src/curlsrc.tmpl
+++ b/projects/Windows/VC10/src/curlsrc.tmpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="DLL Debug - DLL OpenSSL - DLL LibSSH2|Win32">
@@ -2443,9 +2443,9 @@ CURL_SRC_C_FILES
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\lib\config-win32.h" />
+ <ClInclude Include="..\..\..\..\lib\curl_setup.h" />
<ClInclude Include="..\..\..\..\lib\nonblock.h" />
<ClInclude Include="..\..\..\..\lib\rawstr.h" />
- <ClInclude Include="..\..\..\..\lib\setup.h" />
<ClInclude Include="..\..\..\..\lib\strtoofft.h" />
<ClInclude Include="..\..\..\..\lib\warnless.h" />
CURL_SRC_H_FILES
diff --git a/projects/Windows/VC11/src/curlsrc.tmpl b/projects/Windows/VC11/src/curlsrc.tmpl
index bbaf1f355..6e6a56572 100644
--- a/projects/Windows/VC11/src/curlsrc.tmpl
+++ b/projects/Windows/VC11/src/curlsrc.tmpl
@@ -2483,9 +2483,9 @@ CURL_SRC_C_FILES
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\lib\config-win32.h" />
+ <ClInclude Include="..\..\..\..\lib\curl_setup.h" />
<ClInclude Include="..\..\..\..\lib\nonblock.h" />
<ClInclude Include="..\..\..\..\lib\rawstr.h" />
- <ClInclude Include="..\..\..\..\lib\setup.h" />
<ClInclude Include="..\..\..\..\lib\strtoofft.h" />
<ClInclude Include="..\..\..\..\lib\warnless.h" />
CURL_SRC_H_FILES
diff --git a/projects/Windows/VC12/src/curlsrc.tmpl b/projects/Windows/VC12/src/curlsrc.tmpl
index c8063ad97..8949f5ea1 100644
--- a/projects/Windows/VC12/src/curlsrc.tmpl
+++ b/projects/Windows/VC12/src/curlsrc.tmpl
@@ -2483,9 +2483,9 @@ CURL_SRC_C_FILES
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\lib\config-win32.h" />
+ <ClInclude Include="..\..\..\..\lib\curl_setup.h" />
<ClInclude Include="..\..\..\..\lib\nonblock.h" />
<ClInclude Include="..\..\..\..\lib\rawstr.h" />
- <ClInclude Include="..\..\..\..\lib\setup.h" />
<ClInclude Include="..\..\..\..\lib\strtoofft.h" />
<ClInclude Include="..\..\..\..\lib\warnless.h" />
CURL_SRC_H_FILES
diff --git a/projects/Windows/VC6/src/curlsrc.tmpl b/projects/Windows/VC6/src/curlsrc.tmpl
index a7cc2fbb8..e2f1e222b 100644
--- a/projects/Windows/VC6/src/curlsrc.tmpl
+++ b/projects/Windows/VC6/src/curlsrc.tmpl
@@ -596,15 +596,15 @@ SOURCE="..\..\..\..\lib\config-win32.h"
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\lib\nonblock.h
+SOURCE=..\..\..\..\lib\curl_setup.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\lib\rawstr.h
+SOURCE=..\..\..\..\lib\nonblock.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\lib\setup.h
+SOURCE=..\..\..\..\lib\rawstr.h
# End Source File
# Begin Source File
diff --git a/projects/Windows/VC7.1/src/curlsrc.tmpl b/projects/Windows/VC7.1/src/curlsrc.tmpl
index fe308f1a0..98d0c8396 100644
--- a/projects/Windows/VC7.1/src/curlsrc.tmpl
+++ b/projects/Windows/VC7.1/src/curlsrc.tmpl
@@ -1238,13 +1238,13 @@ CURL_SRC_C_FILES
RelativePath="..\..\..\..\lib\config-win32.h">
</File>
<File
- RelativePath="..\..\..\..\lib\nonblock.h">
+ RelativePath="..\..\..\..\lib\curl_setup.h">
</File>
<File
- RelativePath="..\..\..\..\lib\rawstr.h">
+ RelativePath="..\..\..\..\lib\nonblock.h">
</File>
<File
- RelativePath="..\..\..\..\lib\setup.h">
+ RelativePath="..\..\..\..\lib\rawstr.h">
</File>
<File
RelativePath="..\..\..\..\lib\strtoofft.h">
diff --git a/projects/Windows/VC7/src/curlsrc.tmpl b/projects/Windows/VC7/src/curlsrc.tmpl
index 189179a38..cb538ef0c 100644
--- a/projects/Windows/VC7/src/curlsrc.tmpl
+++ b/projects/Windows/VC7/src/curlsrc.tmpl
@@ -1116,13 +1116,13 @@ CURL_SRC_C_FILES
RelativePath="..\..\..\..\lib\config-win32.h">
</File>
<File
- RelativePath="..\..\..\..\lib\nonblock.h">
+ RelativePath="..\..\..\..\lib\curl_setup.h">
</File>
<File
- RelativePath="..\..\..\..\lib\rawstr.h">
+ RelativePath="..\..\..\..\lib\nonblock.h">
</File>
<File
- RelativePath="..\..\..\..\lib\setup.h">
+ RelativePath="..\..\..\..\lib\rawstr.h">
</File>
<File
RelativePath="..\..\..\..\lib\strtoofft.h">
diff --git a/projects/Windows/VC8/src/curlsrc.tmpl b/projects/Windows/VC8/src/curlsrc.tmpl
index d2906e5a5..78a2861d9 100644
--- a/projects/Windows/VC8/src/curlsrc.tmpl
+++ b/projects/Windows/VC8/src/curlsrc.tmpl
@@ -3790,15 +3790,15 @@ CURL_SRC_C_FILES
>
</File>
<File
- RelativePath="..\..\..\..\lib\nonblock.h"
+ RelativePath="..\..\..\..\lib\curl_setup.h"
>
</File>
<File
- RelativePath="..\..\..\..\lib\rawstr.h"
+ RelativePath="..\..\..\..\lib\nonblock.h"
>
</File>
<File
- RelativePath="..\..\..\..\lib\setup.h"
+ RelativePath="..\..\..\..\lib\rawstr.h"
>
</File>
<File
diff --git a/projects/Windows/VC9/src/curlsrc.tmpl b/projects/Windows/VC9/src/curlsrc.tmpl
index 8eef8db0c..5b11ab596 100644
--- a/projects/Windows/VC9/src/curlsrc.tmpl
+++ b/projects/Windows/VC9/src/curlsrc.tmpl
@@ -3751,15 +3751,15 @@ CURL_SRC_C_FILES
>
</File>
<File
- RelativePath="..\..\..\..\lib\nonblock.h"
+ RelativePath="..\..\..\..\lib\curl_setup.h"
>
</File>
<File
- RelativePath="..\..\..\..\lib\rawstr.h"
+ RelativePath="..\..\..\..\lib\nonblock.h"
>
</File>
<File
- RelativePath="..\..\..\..\lib\setup.h"
+ RelativePath="..\..\..\..\lib\rawstr.h"
>
</File>
<File
diff --git a/src/Makefile.inc b/src/Makefile.inc
index 674356a7e..64d55ecf9 100644
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -17,7 +17,7 @@ CURLX_CFILES = \
../lib/warnless.c
CURLX_HFILES = \
- ../lib/setup.h \
+ ../lib/curl_setup.h \
../lib/strtoofft.h \
../lib/strdup.h \
../lib/rawstr.h \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 12:13:51 +0000