Merge branch 'master' of ssh://git.kernel.dk/data/git/fio

diff --git a/configure b/configure
index ef7be0180258abecd4703ebfcf4ed63625d6392f..0f1acd0b78e125f1d1d2301ff14d3b21eee6201e 100755 (executable)
--- a/configure
+++ b/configure
@@ -243,6 +243,7 @@ CYGWIN*)
   output_sym "CONFIG_CLOCK_GETTIME"
   output_sym "CONFIG_SCHED_IDLE"
   output_sym "CONFIG_TCP_NODELAY"
+  output_sym "CONFIG_TLS_THREAD"
   echo "CC=$CC" >> $config_host_mak
   echo "BUILD_CFLAGS=$CFLAGS -include config-host.h -D_GNU_SOURCE" >> $config_host_mak
   exit 0

diff --git a/os/windows/install.wxs b/os/windows/install.wxs
index ac145bcc51be5b49c683632092755d47b81a6256..adc50f65844b488b23d7da1bcfc4134312a66029 100755 (executable)
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -27,7 +27,7 @@
                                                        <File Source="..\..\fio.exe"/>
                                                </Component>
                                                <Component>
-                                                       <File KeyPath="yes" Source="..\..\pthreadGC2.dll"/>
+                                                       <File KeyPath="yes" Source="..\..\libwinpthread-1.dll"/>
                                                </Component>
                                                <Component>
                                                        <File Id="README" Name="README.txt" Source="..\..\README"/>