The following changes since commit cab2440c23426b06e7e8327c5353fbd8373dcb5a:
gerror: mixed code/data section (2013-04-18 05:22:37 -0700)
are available in the git repository at:
git://git.kernel.dk/fio.git master
Bruce Cran (2):
Fix Windows build warnings.
Really suppress ICE61 when building the Windows installer.
engines/windowsaio.c | 1 -
os/os-windows.h | 7 ++++---
os/windows/dobuild.cmd | 4 ++--
os/windows/posix.c | 3 ++-
4 files changed, 8 insertions(+), 7 deletions(-)
---
Diff of recent changes:
diff --git a/engines/windowsaio.c b/engines/windowsaio.c
index f32c356..ee89fa1 100644
--- a/engines/windowsaio.c
+++ b/engines/windowsaio.c
@@ -9,7 +9,6 @@
#include <unistd.h>
#include <signal.h>
#include <errno.h>
-#include <windows.h>
#include "../fio.h"
diff --git a/os/os-windows.h b/os/os-windows.h
index 09f9c54..4f4e2bb 100644
--- a/os/os-windows.h
+++ b/os/os-windows.h
@@ -7,6 +7,7 @@
#include <sys/shm.h>
#include <sys/stat.h>
#include <errno.h>
+#include <winsock2.h>
#include <windows.h>
#include <psapi.h>
#include <stdlib.h>
@@ -112,6 +113,9 @@ static inline int blockdev_size(struct fio_file *f, unsigned long long *bytes)
{
int rc = 0;
HANDLE hFile;
+ GET_LENGTH_INFORMATION info;
+ DWORD outBytes;
+ LARGE_INTEGER size;
if (f->hFile == NULL) {
hFile = CreateFile(f->file_name, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
@@ -120,9 +124,6 @@ static inline int blockdev_size(struct fio_file *f, unsigned long long *bytes)
hFile = f->hFile;
}
- GET_LENGTH_INFORMATION info;
- DWORD outBytes;
- LARGE_INTEGER size;
size.QuadPart = 0;
if (DeviceIoControl(hFile, IOCTL_DISK_GET_LENGTH_INFO, NULL, 0, &info, sizeof(info), &outBytes, NULL))
*bytes = info.Length.QuadPart;
diff --git a/os/windows/dobuild.cmd b/os/windows/dobuild.cmd
index 166578a..fd54a9c 100644
--- a/os/windows/dobuild.cmd
+++ b/os/windows/dobuild.cmd
@@ -20,5 +20,5 @@ if not defined FIO_ARCH (
@if ERRORLEVEL 1 goto end
"%WIX%bin\candle" -nologo -arch %FIO_ARCH% examples.wxs
@if ERRORLEVEL 1 goto end
-"%WIX%bin\light" -nologo -sice:61 install.wixobj examples.wixobj -ext WixUIExtension -out %FIO_VERSION%-%FIO_ARCH%.msi
-:end
\ No newline at end of file
+"%WIX%bin\light" -nologo -sice:ICE61 install.wixobj examples.wixobj -ext WixUIExtension -out %FIO_VERSION%-%FIO_ARCH%.msi
+:end
diff --git a/os/windows/posix.c b/os/windows/posix.c
index 6a7841d..794a707 100755
--- a/os/windows/posix.c
+++ b/os/windows/posix.c
@@ -421,6 +421,7 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp)
{
static LARGE_INTEGER freq = {{0,0}};
LARGE_INTEGER counts;
+ uint64_t t;
QueryPerformanceCounter(&counts);
if (freq.QuadPart == 0)
@@ -429,7 +430,7 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp)
tp->tv_sec = counts.QuadPart / freq.QuadPart;
/* Get the difference between the number of ns stored
* in 'tv_sec' and that stored in 'counts' */
- uint64_t t = tp->tv_sec * freq.QuadPart;
+ t = tp->tv_sec * freq.QuadPart;
t = counts.QuadPart - t;
/* 't' now contains the number of cycles since the last second.
* We want the number of nanoseconds, so multiply out by 1,000,000,000
--
To unsubscribe from this list: send the line "unsubscribe fio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
