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

xsixing · Nov 27, 2013 · e171fde · e171fde
2 parents 292cc47 + 7d6be13
commit e171fde
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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"/>