mirror of
https://git.jami.net/savoirfairelinux/jami-daemon.git
synced 2025-08-12 22:09:25 +08:00
212b50e973
After removing the boost dependency, the Ring UWP was unable to load accounts with upnp enabled, as a deadlock would occur within the threadpool initialization rountine of libupnp. I think the windows store build of pthreads was preventing win32 thread management api symbols from being defined. Something which loading boost must have been doing. - Bumps pthreads-win32 from 2.9.1-release to 2.10.0-rc - Builds a win32 static lib without windows store flags and uwp libs - Modifies the libupnp and threadutils vs project patching Change-Id: I3f43a066d86d284c614521fdb016810148590e70
579 lines
16 KiB
Diff
579 lines
16 KiB
Diff
--- a/.gitignore
|
||
+++ b/.gitignore
|
||
@@ -1,18 +1,256 @@
|
||
-*.obj
|
||
-*.dll.manifest
|
||
-*.dll
|
||
-*.exe.manifest
|
||
+## Ignore Visual Studio temporary files, build results, and
|
||
+## files generated by popular Visual Studio add-ons.
|
||
+
|
||
+#output directories
|
||
+DebugLib/
|
||
+Debug/
|
||
+ReleaseLib/
|
||
+Release/
|
||
+.config/
|
||
+# User-specific files
|
||
+*.suo
|
||
+*.user
|
||
+*.userosscache
|
||
+*.sln.docstates
|
||
+*.VC.VC.opendb
|
||
+*.VC.db
|
||
+*.db
|
||
+*.idb
|
||
+*.filters
|
||
*.exe
|
||
*.lib
|
||
-*.pdb
|
||
+*.bsc
|
||
+*.tlog
|
||
+*.o
|
||
+
|
||
+# User-specific files (MonoDevelop/Xamarin Studio)
|
||
+*.userprefs
|
||
+
|
||
+# Build results
|
||
+[Dd]ebug/
|
||
+[Dd]ebugPublic/
|
||
+[Rr]elease/
|
||
+[Rr]eleases/
|
||
+x64/
|
||
+x86/
|
||
+bld/
|
||
+[Bb]in/
|
||
+[Oo]bj/
|
||
+output/
|
||
+Win32/
|
||
+
|
||
+# Visual Studio 2015 cache/options directory
|
||
+.vs/
|
||
+# Uncomment if you have tasks that create the project's static files in wwwroot
|
||
+#wwwroot/
|
||
+
|
||
+# MSTest test Results
|
||
+[Tt]est[Rr]esult*/
|
||
+[Bb]uild[Ll]og.*
|
||
+
|
||
+# NUNIT
|
||
+*.VisualState.xml
|
||
+TestResult.xml
|
||
+
|
||
+# Build Results of an ATL Project
|
||
+[Dd]ebugPS/
|
||
+[Rr]eleasePS/
|
||
+dlldata.c
|
||
+
|
||
+# DNX
|
||
+project.lock.json
|
||
+artifacts/
|
||
+
|
||
+#*_i.c
|
||
+#*_p.c
|
||
+#*_i.h
|
||
*.ilk
|
||
-*.exp
|
||
-version.res
|
||
-tests/*.pass
|
||
-tests/*.bench
|
||
-tests/pthread.h
|
||
-tests/sched.h
|
||
-tests/semaphore.h
|
||
-tests/benchlib.o
|
||
-tests/SIZES.*
|
||
-tests/*.log
|
||
\ No newline at end of file
|
||
+*.meta
|
||
+*.obj
|
||
+*.pch
|
||
+*.pdb
|
||
+*.pgc
|
||
+*.pgd
|
||
+*.rsp
|
||
+*.sbr
|
||
+*.tlb
|
||
+*.tli
|
||
+*.tlh
|
||
+*.tmp
|
||
+*.tmp_proj
|
||
+*.log
|
||
+*.vspscc
|
||
+*.vssscc
|
||
+.builds
|
||
+*.pidb
|
||
+*.svclog
|
||
+*.scc
|
||
+
|
||
+# Chutzpah Test files
|
||
+_Chutzpah*
|
||
+
|
||
+# Visual C++ cache files
|
||
+ipch/
|
||
+*.aps
|
||
+*.ncb
|
||
+*.opendb
|
||
+*.opensdf
|
||
+*.sdf
|
||
+*.cachefile
|
||
+
|
||
+# Visual Studio profiler
|
||
+*.psess
|
||
+*.vsp
|
||
+*.vspx
|
||
+*.sap
|
||
+
|
||
+# TFS 2012 Local Workspace
|
||
+$tf/
|
||
+
|
||
+# Guidance Automation Toolkit
|
||
+*.gpState
|
||
+
|
||
+# ReSharper is a .NET coding add-in
|
||
+_ReSharper*/
|
||
+*.[Rr]e[Ss]harper
|
||
+*.DotSettings.user
|
||
+
|
||
+# JustCode is a .NET coding add-in
|
||
+.JustCode
|
||
+
|
||
+# TeamCity is a build add-in
|
||
+_TeamCity*
|
||
+
|
||
+# DotCover is a Code Coverage Tool
|
||
+*.dotCover
|
||
+
|
||
+# NCrunch
|
||
+_NCrunch_*
|
||
+.*crunch*.local.xml
|
||
+nCrunchTemp_*
|
||
+
|
||
+# MightyMoose
|
||
+*.mm.*
|
||
+AutoTest.Net/
|
||
+
|
||
+# Web workbench (sass)
|
||
+.sass-cache/
|
||
+
|
||
+# Installshield output folder
|
||
+[Ee]xpress/
|
||
+
|
||
+# DocProject is a documentation generator add-in
|
||
+DocProject/buildhelp/
|
||
+DocProject/Help/*.HxT
|
||
+DocProject/Help/*.HxC
|
||
+DocProject/Help/*.hhc
|
||
+DocProject/Help/*.hhk
|
||
+DocProject/Help/*.hhp
|
||
+DocProject/Help/Html2
|
||
+DocProject/Help/html
|
||
+
|
||
+# Click-Once directory
|
||
+publish/
|
||
+
|
||
+# Publish Web Output
|
||
+*.[Pp]ublish.xml
|
||
+*.azurePubxml
|
||
+# TODO: Comment the next line if you want to checkin your web deploy settings
|
||
+# but database connection strings (with potential passwords) will be unencrypted
|
||
+*.pubxml
|
||
+*.publishproj
|
||
+
|
||
+# NuGet Packages
|
||
+*.nupkg
|
||
+# The packages folder can be ignored because of Package Restore
|
||
+**/packages/*
|
||
+# except build/, which is used as an MSBuild target.
|
||
+!**/packages/build/
|
||
+# Uncomment if necessary however generally it will be regenerated when needed
|
||
+#!**/packages/repositories.config
|
||
+# NuGet v3's project.json files produces more ignoreable files
|
||
+*.nuget.props
|
||
+*.nuget.targets
|
||
+
|
||
+# Microsoft Azure Build Output
|
||
+csx/
|
||
+*.build.csdef
|
||
+
|
||
+# Microsoft Azure Emulator
|
||
+ecf/
|
||
+rcf/
|
||
+
|
||
+# Microsoft Azure ApplicationInsights config file
|
||
+ApplicationInsights.config
|
||
+
|
||
+# Windows Store app package directory
|
||
+AppPackages/
|
||
+BundleArtifacts/
|
||
+
|
||
+# Visual Studio cache files
|
||
+# files ending in .cache can be ignored
|
||
+*.[Cc]ache
|
||
+# but keep track of directories ending in .cache
|
||
+!*.[Cc]ache/
|
||
+
|
||
+# Others
|
||
+ClientBin/
|
||
+~$*
|
||
+*~
|
||
+*.dbmdl
|
||
+*.dbproj.schemaview
|
||
+*.pfx
|
||
+*.publishsettings
|
||
+node_modules/
|
||
+orleans.codegen.cs
|
||
+
|
||
+# RIA/Silverlight projects
|
||
+Generated_Code/
|
||
+
|
||
+# Backup & report files from converting an old project file
|
||
+# to a newer Visual Studio version. Backup files are not needed,
|
||
+# because we have git ;-)
|
||
+_UpgradeReport_Files/
|
||
+Backup*/
|
||
+UpgradeLog*.XML
|
||
+UpgradeLog*.htm
|
||
+
|
||
+# SQL Server files
|
||
+*.mdf
|
||
+*.ldf
|
||
+
|
||
+# Business Intelligence projects
|
||
+*.rdl.data
|
||
+*.bim.layout
|
||
+*.bim_*.settings
|
||
+
|
||
+# Microsoft Fakes
|
||
+FakesAssemblies/
|
||
+
|
||
+# GhostDoc plugin setting file
|
||
+*.GhostDoc.xml
|
||
+
|
||
+# Node.js Tools for Visual Studio
|
||
+.ntvs_analysis.dat
|
||
+
|
||
+# Visual Studio 6 build log
|
||
+*.plg
|
||
+
|
||
+# Visual Studio 6 workspace options file
|
||
+*.opt
|
||
+
|
||
+# Visual Studio LightSwitch build output
|
||
+**/*.HTMLClient/GeneratedArtifacts
|
||
+**/*.DesktopClient/GeneratedArtifacts
|
||
+**/*.DesktopClient/ModelManifest.xml
|
||
+**/*.Server/GeneratedArtifacts
|
||
+**/*.Server/ModelManifest.xml
|
||
+_Pvt_Extensions
|
||
+
|
||
+# Paket dependency manager
|
||
+.paket/paket.exe
|
||
+
|
||
+# FAKE - F# Make
|
||
+.fake/
|
||
+
|
||
+!config.h
|
||
--- /dev/null
|
||
+++ b/MSVC/pthreads.sln
|
||
@@ -0,0 +1,28 @@
|
||
+
|
||
+Microsoft Visual Studio Solution File, Format Version 12.00
|
||
+# Visual Studio 14
|
||
+VisualStudioVersion = 14.0.25420.1
|
||
+MinimumVisualStudioVersion = 10.0.40219.1
|
||
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pthreads", "pthreads.vcxproj", "{CC0B570C-7F2D-4809-98F4-57D97E2E7317}"
|
||
+EndProject
|
||
+Global
|
||
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||
+ Debug|x64 = Debug|x64
|
||
+ Debug|x86 = Debug|x86
|
||
+ Release|x64 = Release|x64
|
||
+ Release|x86 = Release|x86
|
||
+ EndGlobalSection
|
||
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||
+ {CC0B570C-7F2D-4809-98F4-57D97E2E7317}.Debug|x64.ActiveCfg = Debug|x64
|
||
+ {CC0B570C-7F2D-4809-98F4-57D97E2E7317}.Debug|x64.Build.0 = Debug|x64
|
||
+ {CC0B570C-7F2D-4809-98F4-57D97E2E7317}.Debug|x86.ActiveCfg = Debug|Win32
|
||
+ {CC0B570C-7F2D-4809-98F4-57D97E2E7317}.Debug|x86.Build.0 = Debug|Win32
|
||
+ {CC0B570C-7F2D-4809-98F4-57D97E2E7317}.Release|x64.ActiveCfg = Release|x64
|
||
+ {CC0B570C-7F2D-4809-98F4-57D97E2E7317}.Release|x64.Build.0 = Release|x64
|
||
+ {CC0B570C-7F2D-4809-98F4-57D97E2E7317}.Release|x86.ActiveCfg = Release|Win32
|
||
+ {CC0B570C-7F2D-4809-98F4-57D97E2E7317}.Release|x86.Build.0 = Release|Win32
|
||
+ EndGlobalSection
|
||
+ GlobalSection(SolutionProperties) = preSolution
|
||
+ HideSolutionNode = FALSE
|
||
+ EndGlobalSection
|
||
+EndGlobal
|
||
--- /dev/null
|
||
+++ b/MSVC/pthreads.vcxproj
|
||
@@ -0,0 +1,139 @@
|
||
+<?xml version="1.0" encoding="utf-8"?>
|
||
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||
+ <ItemGroup Label="ProjectConfigurations">
|
||
+ <ProjectConfiguration Include="Debug|Win32">
|
||
+ <Configuration>Debug</Configuration>
|
||
+ <Platform>Win32</Platform>
|
||
+ </ProjectConfiguration>
|
||
+ <ProjectConfiguration Include="Release|Win32">
|
||
+ <Configuration>Release</Configuration>
|
||
+ <Platform>Win32</Platform>
|
||
+ </ProjectConfiguration>
|
||
+ <ProjectConfiguration Include="Debug|x64">
|
||
+ <Configuration>Debug</Configuration>
|
||
+ <Platform>x64</Platform>
|
||
+ </ProjectConfiguration>
|
||
+ <ProjectConfiguration Include="Release|x64">
|
||
+ <Configuration>Release</Configuration>
|
||
+ <Platform>x64</Platform>
|
||
+ </ProjectConfiguration>
|
||
+ </ItemGroup>
|
||
+ <PropertyGroup Label="Globals">
|
||
+ <ProjectGuid>{CC0B570C-7F2D-4809-98F4-57D97E2E7317}</ProjectGuid>
|
||
+ <RootNamespace>pthreads</RootNamespace>
|
||
+ <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
|
||
+ </PropertyGroup>
|
||
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||
+ <ConfigurationType>Application</ConfigurationType>
|
||
+ <UseDebugLibraries>true</UseDebugLibraries>
|
||
+ <PlatformToolset>v140</PlatformToolset>
|
||
+ <CharacterSet>MultiByte</CharacterSet>
|
||
+ </PropertyGroup>
|
||
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||
+ <ConfigurationType>Application</ConfigurationType>
|
||
+ <UseDebugLibraries>false</UseDebugLibraries>
|
||
+ <PlatformToolset>v140</PlatformToolset>
|
||
+ <WholeProgramOptimization>true</WholeProgramOptimization>
|
||
+ <CharacterSet>MultiByte</CharacterSet>
|
||
+ </PropertyGroup>
|
||
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||
+ <ConfigurationType>Application</ConfigurationType>
|
||
+ <UseDebugLibraries>true</UseDebugLibraries>
|
||
+ <PlatformToolset>v140</PlatformToolset>
|
||
+ <CharacterSet>MultiByte</CharacterSet>
|
||
+ </PropertyGroup>
|
||
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||
+ <ConfigurationType>StaticLibrary</ConfigurationType>
|
||
+ <UseDebugLibraries>false</UseDebugLibraries>
|
||
+ <PlatformToolset>v140</PlatformToolset>
|
||
+ <WholeProgramOptimization>true</WholeProgramOptimization>
|
||
+ <CharacterSet>MultiByte</CharacterSet>
|
||
+ </PropertyGroup>
|
||
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||
+ <ImportGroup Label="ExtensionSettings">
|
||
+ </ImportGroup>
|
||
+ <ImportGroup Label="Shared">
|
||
+ </ImportGroup>
|
||
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||
+ </ImportGroup>
|
||
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||
+ </ImportGroup>
|
||
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||
+ </ImportGroup>
|
||
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||
+ </ImportGroup>
|
||
+ <PropertyGroup Label="UserMacros" />
|
||
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||
+ <TargetName>$(ProjectName)</TargetName>
|
||
+ <OutDir>$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
|
||
+ </PropertyGroup>
|
||
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||
+ <ClCompile>
|
||
+ <WarningLevel>Level3</WarningLevel>
|
||
+ <Optimization>Disabled</Optimization>
|
||
+ <SDLCheck>true</SDLCheck>
|
||
+ </ClCompile>
|
||
+ </ItemDefinitionGroup>
|
||
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||
+ <ClCompile>
|
||
+ <WarningLevel>Level3</WarningLevel>
|
||
+ <Optimization>Disabled</Optimization>
|
||
+ <SDLCheck>true</SDLCheck>
|
||
+ </ClCompile>
|
||
+ </ItemDefinitionGroup>
|
||
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||
+ <ClCompile>
|
||
+ <WarningLevel>Level3</WarningLevel>
|
||
+ <Optimization>MaxSpeed</Optimization>
|
||
+ <FunctionLevelLinking>true</FunctionLevelLinking>
|
||
+ <IntrinsicFunctions>true</IntrinsicFunctions>
|
||
+ <SDLCheck>true</SDLCheck>
|
||
+ </ClCompile>
|
||
+ <Link>
|
||
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||
+ <OptimizeReferences>true</OptimizeReferences>
|
||
+ </Link>
|
||
+ </ItemDefinitionGroup>
|
||
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||
+ <ClCompile>
|
||
+ <WarningLevel>Level3</WarningLevel>
|
||
+ <Optimization>MaxSpeed</Optimization>
|
||
+ <FunctionLevelLinking>true</FunctionLevelLinking>
|
||
+ <IntrinsicFunctions>true</IntrinsicFunctions>
|
||
+ <SDLCheck>true</SDLCheck>
|
||
+ <PreprocessorDefinitions>PTW32_CONFIG_H;PTW32_STATIC_LIB;NEED_PROCESS_AFFINITY_MASK;HAVE_STRUCT_TIMESPEC;__CLEANUP_C;WIN32;NDEBUG;_WINDOWS;PTW32_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||
+ <AdditionalIncludeDirectories>$(ProjectDir)..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||
+ </ClCompile>
|
||
+ <Link>
|
||
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||
+ <OptimizeReferences>true</OptimizeReferences>
|
||
+ </Link>
|
||
+ <PostBuildEvent>
|
||
+ <Command>mkdir $(ProjectDir)..\..\include
|
||
+xcopy /S /Y $(ProjectDir)..\sched.h $(ProjectDir)..\..\include
|
||
+xcopy /S /Y $(ProjectDir)..\semaphore.h $(ProjectDir)..\..\include
|
||
+xcopy /S /Y $(ProjectDir)..\pthread.h $(ProjectDir)..\..\include
|
||
+mkdir $(ProjectDir)..\..\lib
|
||
+mkdir $(ProjectDir)..\..\lib\x64
|
||
+xcopy /S /Y $(OutDir)pthreads.lib $(ProjectDir)..\..\lib\x64
|
||
+xcopy /S /Y $(OutDir)pthreads.pdb $(ProjectDir)..\..\lib\x64</Command>
|
||
+ </PostBuildEvent>
|
||
+ </ItemDefinitionGroup>
|
||
+ <ItemGroup>
|
||
+ <ClCompile Include="..\pthread.c" />
|
||
+ </ItemGroup>
|
||
+ <ItemGroup>
|
||
+ <ClInclude Include="..\implement.h" />
|
||
+ <ClInclude Include="..\pthread.h" />
|
||
+ <ClInclude Include="..\sched.h" />
|
||
+ <ClInclude Include="..\semaphore.h" />
|
||
+ </ItemGroup>
|
||
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||
+ <ImportGroup Label="ExtensionTargets">
|
||
+ </ImportGroup>
|
||
+</Project>
|
||
\ No newline at end of file
|
||
--- a/_ptw32.h
|
||
+++ b/_ptw32.h
|
||
@@ -166,8 +166,9 @@
|
||
# define int64_t LONGLONG
|
||
# define uint64_t ULONGLONG
|
||
#elif !defined(__MINGW32__)
|
||
-# define int64_t _int64
|
||
-# define uint64_t unsigned _int64
|
||
+#include <stdint.h>
|
||
+//# define int64_t _int64
|
||
+//# define uint64_t unsigned _int64
|
||
# if defined(PTW32_CONFIG_MSVC6)
|
||
typedef long intptr_t;
|
||
# endif
|
||
--- a/config.h
|
||
+++ b/config.h
|
||
@@ -10,9 +10,6 @@
|
||
/* We're building the pthreads-win32 library */
|
||
#define PTW32_BUILD
|
||
|
||
-/* CPU affinity */
|
||
-#define HAVE_CPU_AFFINITY
|
||
-
|
||
/* Do we know about the C type sigset_t? */
|
||
#undef HAVE_SIGSET_T
|
||
|
||
@@ -49,7 +46,7 @@
|
||
/* Do we know about type mode_t? */
|
||
#undef HAVE_MODE_T
|
||
|
||
-/*
|
||
+/*
|
||
* Define if GCC has atomic builtins, i.e. __sync_* intrinsics
|
||
* __sync_lock_* is implemented in mingw32 gcc 4.5.2 at least
|
||
* so this define does not turn those on or off. If you get an
|
||
@@ -112,27 +109,32 @@
|
||
* to the pthreads-win32 maintainer. Thanks.
|
||
*********************************************************************/
|
||
#if defined(WINCE)
|
||
-# undef HAVE_CPU_AFFINITY
|
||
-# define NEED_DUPLICATEHANDLE
|
||
-# define NEED_CREATETHREAD
|
||
-# define NEED_ERRNO
|
||
-# define NEED_CALLOC
|
||
-# define NEED_FTIME
|
||
-/* # define NEED_SEM */
|
||
-# define NEED_UNICODE_CONSTS
|
||
-# define NEED_PROCESS_AFFINITY_MASK
|
||
+#define NEED_DUPLICATEHANDLE
|
||
+#define NEED_CREATETHREAD
|
||
+#define NEED_ERRNO
|
||
+#define NEED_CALLOC
|
||
+#define NEED_FTIME
|
||
+/* #define NEED_SEM */
|
||
+#define NEED_UNICODE_CONSTS
|
||
+#define NEED_PROCESS_AFFINITY_MASK
|
||
/* This may not be needed */
|
||
-# define RETAIN_WSALASTERROR
|
||
+#define RETAIN_WSALASTERROR
|
||
#endif
|
||
|
||
#if defined(_UWIN)
|
||
-# define HAVE_MODE_T
|
||
-# define HAVE_STRUCT_TIMESPEC
|
||
-# define HAVE_SIGNAL_H
|
||
+#define HAVE_MODE_T
|
||
+#define HAVE_STRUCT_TIMESPEC
|
||
#endif
|
||
|
||
#if defined(__GNUC__)
|
||
-# define HAVE_C_INLINE
|
||
+#define HAVE_C_INLINE
|
||
+#endif
|
||
+
|
||
+#if defined(__MINGW64__)
|
||
+#define HAVE_MODE_T
|
||
+#define HAVE_STRUCT_TIMESPEC
|
||
+#elif defined(__MINGW32__)
|
||
+#define HAVE_MODE_T
|
||
#endif
|
||
|
||
#if defined(__BORLANDC__)
|
||
@@ -146,8 +148,6 @@
|
||
#define HAVE_C_INLINE
|
||
#endif
|
||
|
||
-#if defined(_MSC_VER) && _MSC_VER >= 1900
|
||
-#define HAVE_STRUCT_TIMESPEC
|
||
-#endif
|
||
|
||
-#endif /* PTW32_CONFIG_H */
|
||
+
|
||
+#endif
|
||
--- a/pthread_cancel.c
|
||
+++ b/pthread_cancel.c
|
||
@@ -67,12 +67,12 @@ ptw32_cancel_callback (ULONG_PTR unused)
|
||
DWORD
|
||
ptw32_Registercancellation (PAPCFUNC unused1, HANDLE threadH, DWORD unused2)
|
||
{
|
||
- CONTEXT context;
|
||
+ /*CONTEXT context;
|
||
|
||
context.ContextFlags = CONTEXT_CONTROL;
|
||
GetThreadContext (threadH, &context);
|
||
PTW32_PROGCTR (context) = (DWORD_PTR) ptw32_cancel_self;
|
||
- SetThreadContext (threadH, &context);
|
||
+ SetThreadContext (threadH, &context);*/
|
||
return 0;
|
||
}
|
||
|
||
--- a/pthread_win32_attach_detach_np.c
|
||
+++ b/pthread_win32_attach_detach_np.c
|
||
@@ -89,11 +89,11 @@ pthread_win32_process_attach_np ()
|
||
}
|
||
#else
|
||
# if ! defined(WINCE)
|
||
- if(GetSystemDirectory(QuserExDLLPathBuf, sizeof(QuserExDLLPathBuf)/sizeof(TCHAR)) &&
|
||
+ /*if(GetSystemDirectory(QuserExDLLPathBuf, sizeof(QuserExDLLPathBuf)/sizeof(TCHAR)) &&
|
||
0 == _tcsncat_s(QuserExDLLPathBuf, _countof(QuserExDLLPathBuf), TEXT("\\QUSEREX.DLL"), 12))
|
||
{
|
||
ptw32_h_quserex = LoadLibrary(QuserExDLLPathBuf);
|
||
- }
|
||
+ }*/
|
||
# endif
|
||
#endif
|
||
|
||
--
|
||
2.10.2.windows.1
|
||
|