The following changes since commit 47ea504af7710960e4019254cb910f69a32cb242:
Ensure that non-git basic installs return sane version information (2012-06-06 08:20:27 +0200)
are available in the git repository at:
git://git.kernel.dk/fio.git master
Bruce Cran (1):
Windows 32-bit fio fixes
Makefile | 1 +
os/windows/install.wxs | 2 +-
os/windows/posix.c | 4 +++-
3 files changed, 5 insertions(+), 2 deletions(-)
---
Diff of recent changes:
diff --git a/Makefile b/Makefile
index f72bf8e..6a41710 100644
--- a/Makefile
+++ b/Makefile
@@ -61,6 +61,7 @@ ifneq (,$(findstring CYGWIN,$(UNAME)))
LIBS += -lpthread -lpsapi -lws2_32
CFLAGS += -DPSAPI_VERSION=1 -Ios/windows/posix/include -Wno-format
CC = x86_64-w64-mingw32-gcc
+ #CC = i686-w64-mingw32-gcc
endif
OBJS = $(SOURCE:.c=.o)
diff --git a/os/windows/install.wxs b/os/windows/install.wxs
index 5bea45c..f8da8fc 100755
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -7,7 +7,7 @@
<?define ProgramDirectory = ProgramFiles64Folder ?>
<?endif?>
- <Product Id="CCE88492-8C5A-4EAF-8B82-E22A90CEC47B"
+ <Product Id="2BA394F9-0D9E-4597-BB9D-6B18097D64BB"
Codepage="1252" Language="1033"
Manufacturer="fio" Name="fio"
UpgradeCode="2338A332-5511-43cf-b9BD-5C60496CCFCC" Version="2.0.8">
diff --git a/os/windows/posix.c b/os/windows/posix.c
index 9ef369e..41bcb2d 100755
--- a/os/windows/posix.c
+++ b/os/windows/posix.c
@@ -393,7 +393,9 @@ HANDLE fileMappings[1024];
int shmget(key_t key, size_t size, int shmflg)
{
int mapid = -1;
- HANDLE hMapping = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, (PAGE_EXECUTE_READWRITE | SEC_RESERVE), size >> 32, size & 0xFFFFFFFF, NULL);
+ uint32_t size_low = size & 0xFFFFFFFF;
+ uint32_t size_high = ((uint64_t)size) >> 32;
+ HANDLE hMapping = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, (PAGE_EXECUTE_READWRITE | SEC_RESERVE), size_high, size_low, NULL);
if (hMapping != NULL) {
fileMappings[nFileMappings] = hMapping;
mapid = nFileMappings;
--
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
