gnunet-svn
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [libmicrohttpd] branch master updated (6d1ae16a -> 8fa8f783

From: gnunet
Subject: [GNUnet-SVN] [libmicrohttpd] branch master updated (6d1ae16a -> 8fa8f783)
Date: Mon, 27 Mar 2017 14:29:10 +0200 
This is an automated email from the git hooks/post-receive script.

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 6d1ae16a MHD_start_daemon(): fixed c/p error resulted in nonfunctional 
SO_EXCLBIND on Solaris
     new 9a18334b Fixed non-TLS builds after 
7b0d92902c92782844e84e40ab54d58a65531a65
     new 8fa8f783 Added VS2017 project files

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/microhttpd/daemon.c                              |  4 ++++
 w32/{VS2013 => VS2017}/.gitignore                    |  1 +
 w32/{VS2015 => VS2017}/hellobrowser.vcxproj          |  8 ++++----
 w32/{VS2013 => VS2017}/hellobrowser.vcxproj.filters  |  0
 w32/{VS2013 => VS2017}/largepost.vcxproj             |  8 ++++----
 w32/{VS2015 => VS2017}/libmicrohttpd.sln             |  4 ++--
 w32/{VS2013 => VS2017}/libmicrohttpd.vcxproj         | 16 ++++++++--------
 w32/{VS2013 => VS2017}/libmicrohttpd.vcxproj.filters |  0
 w32/{VS2015 => VS2017}/simplepost.vcxproj            |  8 ++++----
 w32/common/common-build-settings.vcxproj             |  4 ++--
 10 files changed, 29 insertions(+), 24 deletions(-)
 copy w32/{VS2013 => VS2017}/.gitignore (92%)
 copy w32/{VS2015 => VS2017}/hellobrowser.vcxproj (95%)
 copy w32/{VS2013 => VS2017}/hellobrowser.vcxproj.filters (100%)
 copy w32/{VS2013 => VS2017}/largepost.vcxproj (95%)
 copy w32/{VS2015 => VS2017}/libmicrohttpd.sln (99%)
 copy w32/{VS2013 => VS2017}/libmicrohttpd.vcxproj (94%)
 copy w32/{VS2013 => VS2017}/libmicrohttpd.vcxproj.filters (100%)
 copy w32/{VS2015 => VS2017}/simplepost.vcxproj (95%)

diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index a5f9f853..a4a9a2b8 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -5486,8 +5486,10 @@ MHD_start_daemon_va (unsigned int flags,
                     _("Failed to create inter-thread communication channel: 
%s\n"),
                     MHD_itc_last_strerror_ ());
 #endif
+#ifdef HTTPS_SUPPORT
           if (NULL != daemon->priority_cache)
             gnutls_priority_deinit (daemon->priority_cache);
+#endif /* HTTPS_SUPPORT */
           free (daemon);
           return NULL;
         }
@@ -5500,8 +5502,10 @@ MHD_start_daemon_va (unsigned int flags,
                     _("file descriptor for inter-thread communication channel 
exceeds maximum value\n"));
 #endif
           MHD_itc_destroy_chk_ (daemon->itc);
+#ifdef HTTPS_SUPPORT
           if (NULL != daemon->priority_cache)
             gnutls_priority_deinit (daemon->priority_cache);
+#endif /* HTTPS_SUPPORT */
           free (daemon);
           return NULL;
         }
diff --git a/w32/VS2013/.gitignore b/w32/VS2017/.gitignore
similarity index 92%
copy from w32/VS2013/.gitignore
copy to w32/VS2017/.gitignore
index d3b4a916..c9144d0a 100644
--- a/w32/VS2013/.gitignore
+++ b/w32/VS2017/.gitignore
@@ -3,3 +3,4 @@
 /hellobrowser
 /largepost
 /simplepost
+/.vs
diff --git a/w32/VS2015/hellobrowser.vcxproj b/w32/VS2017/hellobrowser.vcxproj
similarity index 95%
copy from w32/VS2015/hellobrowser.vcxproj
copy to w32/VS2017/hellobrowser.vcxproj
index d546c5de..4f39659f 100644
--- a/w32/VS2015/hellobrowser.vcxproj
+++ b/w32/VS2017/hellobrowser.vcxproj
@@ -48,26 +48,26 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug-static'" 
Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug-dll'" 
Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release-static'" 
Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release-dll'" 
Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/w32/VS2013/hellobrowser.vcxproj.filters 
b/w32/VS2017/hellobrowser.vcxproj.filters
similarity index 100%
copy from w32/VS2013/hellobrowser.vcxproj.filters
copy to w32/VS2017/hellobrowser.vcxproj.filters
diff --git a/w32/VS2013/largepost.vcxproj b/w32/VS2017/largepost.vcxproj
similarity index 95%
copy from w32/VS2013/largepost.vcxproj
copy to w32/VS2017/largepost.vcxproj
index 79315489..11cadd08 100644
--- a/w32/VS2013/largepost.vcxproj
+++ b/w32/VS2017/largepost.vcxproj
@@ -48,26 +48,26 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug-static'" 
Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug-dll'" 
Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release-static'" 
Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release-dll'" 
Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/w32/VS2015/libmicrohttpd.sln b/w32/VS2017/libmicrohttpd.sln
similarity index 99%
copy from w32/VS2015/libmicrohttpd.sln
copy to w32/VS2017/libmicrohttpd.sln
index 70a7bebf..3971e463 100644
--- a/w32/VS2015/libmicrohttpd.sln
+++ b/w32/VS2017/libmicrohttpd.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.9
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hellobrowser", 
"hellobrowser.vcxproj", "{310F39BD-A2D6-44FF-8344-37ADD0524CBD}"
        ProjectSection(ProjectDependencies) = postProject
diff --git a/w32/VS2013/libmicrohttpd.vcxproj b/w32/VS2017/libmicrohttpd.vcxproj
similarity index 94%
copy from w32/VS2013/libmicrohttpd.vcxproj
copy to w32/VS2017/libmicrohttpd.vcxproj
index fe94a58e..1ea6df2c 100644
--- a/w32/VS2013/libmicrohttpd.vcxproj
+++ b/w32/VS2017/libmicrohttpd.vcxproj
@@ -80,52 +80,52 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug-static'" 
Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug-static-xp'" 
Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug-dll'" 
Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug-dll-xp'" 
Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release-static'" 
Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release-static-xp'" 
Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release-dll'" 
Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release-dll-xp'" 
Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/w32/VS2013/libmicrohttpd.vcxproj.filters 
b/w32/VS2017/libmicrohttpd.vcxproj.filters
similarity index 100%
copy from w32/VS2013/libmicrohttpd.vcxproj.filters
copy to w32/VS2017/libmicrohttpd.vcxproj.filters
diff --git a/w32/VS2015/simplepost.vcxproj b/w32/VS2017/simplepost.vcxproj
similarity index 95%
copy from w32/VS2015/simplepost.vcxproj
copy to w32/VS2017/simplepost.vcxproj
index 8d1c1b32..51f48c02 100644
--- a/w32/VS2015/simplepost.vcxproj
+++ b/w32/VS2017/simplepost.vcxproj
@@ -48,26 +48,26 @@
   <PropertyGroup Condition="'$(Configuration)'=='Debug-static'" 
Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug-dll'" 
Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release-static'" 
Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release-dll'" 
Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/w32/common/common-build-settings.vcxproj 
b/w32/common/common-build-settings.vcxproj
index 94e8e183..f2e512a4 100644
--- a/w32/common/common-build-settings.vcxproj
+++ b/w32/common/common-build-settings.vcxproj
@@ -3,8 +3,8 @@
   <PropertyGroup Label="UserMacros">
     <!-- WinXP = 0; Vista = 1; Win7 = 2; Win8 = 3...
          Only 0 and 1 are used currently -->
-    <TargetOSLevel Condition="'$(PlatformToolset)'=='v120_xp' Or 
'$(PlatformToolset)'=='v140_xp'">0</TargetOSLevel>
-    <TargetOSLevel Condition="'$(PlatformToolset)'!='v120_xp' And 
'$(PlatformToolset)'!='v140_xp'">1</TargetOSLevel>
+    <TargetOSLevel Condition="'$(PlatformToolset)'=='v120_xp' Or 
'$(PlatformToolset)'=='v140_xp' Or 
'$(PlatformToolset)'=='v141_xp'">0</TargetOSLevel>
+    <TargetOSLevel Condition="'$(PlatformToolset)'!='v120_xp' And 
'$(PlatformToolset)'!='v140_xp' And 
'$(PlatformToolset)'!='v141_xp'">1</TargetOSLevel>
   </PropertyGroup>
   <PropertyGroup>
     
<IncludePath>$(SolutionDir);$(MhdW32Common);$(MhdSrc)include;$(IncludePath)</IncludePath>

-- 
To stop receiving notification emails like this one, please contact
address@hidden
reply via email to
[Prev in Thread] Current Thread [Next in Thread]