The following changes since commit 477051b106314f498568551ff7fced453d94795c:
Fio 2.0.12.1 (2012-12-18 19:55:12 +0100)
are available in the git repository at:
git://git.kernel.dk/fio.git master
Bruce Cran (3):
Fix $(CC) override: use system compiler except on HP-UX and Solaris.
Create a new Windows installer product GUID for 2.0.12.
Consistently indent using tabs in Windows files and remove trailing spaces.
Makefile | 6 +++---
os/windows/install.wxs | 2 +-
os/windows/posix/include/dlfcn.h | 2 +-
os/windows/posix/include/sys/uio.h | 2 +-
os/windows/posix/include/sys/un.h | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
---
Diff of recent changes:
diff --git a/Makefile b/Makefile
index 6a1440c..7433504 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,4 @@
-ifneq ($(origin CC), environment)
-CC = $(CROSS_COMPILE)gcc
-endif
+CC ?= gcc
DEBUGFLAGS = -D_FORTIFY_SOURCE=2 -DFIO_INC_DEBUG
CPPFLAGS= -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
$(DEBUGFLAGS)
@@ -37,6 +35,7 @@ ifeq ($(UNAME), Android)
CPPFLAGS += -DFIO_NO_HAVE_SHM_H
endif
ifeq ($(UNAME), SunOS)
+ CC = gcc
SOURCE += fifo.c lib/strsep.c helpers.c engines/posixaio.c \
engines/solarisaio.c
LIBS += -lpthread -ldl -laio -lrt -lnsl -lsocket
@@ -59,6 +58,7 @@ ifeq ($(UNAME), AIX)
LDFLAGS += -L/opt/freeware/lib -Wl,-blibpath:/opt/freeware/lib:/usr/lib:/lib -Wl,-bmaxdata:0x80000000
endif
ifeq ($(UNAME), HP-UX)
+ CC = gcc
SOURCE += fifo.c helpers.c lib/getopt_long.c lib/strsep.c engines/posixaio.c
LIBS += -lpthread -ldl -lrt
CFLAGS += -D_LARGEFILE64_SOURCE
diff --git a/os/windows/install.wxs b/os/windows/install.wxs
index d4913b6..002c6e6 100755
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -7,7 +7,7 @@
<?define ProgramDirectory = ProgramFiles64Folder ?>
<?endif?>
- <Product Id="C3DC8A4F-1191-412F-8287-ACB6BA798F6A"
+ <Product Id="F9883688-6AB3-4BD1-AB93-91D39F12F003"
Codepage="1252" Language="1033"
Manufacturer="fio" Name="fio"
UpgradeCode="2338A332-5511-43cf-b9BD-5C60496CCFCC" Version="2.0.12.1">
diff --git a/os/windows/posix/include/dlfcn.h b/os/windows/posix/include/dlfcn.h
index 2953aec..aaffb52 100644
--- a/os/windows/posix/include/dlfcn.h
+++ b/os/windows/posix/include/dlfcn.h
@@ -1,6 +1,6 @@
#ifndef DLFCN_H
#define DLFCN_H
-
+
#define RTLD_LAZY 1
void *dlopen(const char *file, int mode);
diff --git a/os/windows/posix/include/sys/uio.h b/os/windows/posix/include/sys/uio.h
index 0fac2c0..077550c 100644
--- a/os/windows/posix/include/sys/uio.h
+++ b/os/windows/posix/include/sys/uio.h
@@ -6,7 +6,7 @@
struct iovec
{
- void *iov_base; /* Base address of a memory region for input or output */
+ void *iov_base; /* Base address of a memory region for input or output */
size_t iov_len; /* The size of the memory pointed to by iov_base */
};
diff --git a/os/windows/posix/include/sys/un.h b/os/windows/posix/include/sys/un.h
index ec11805..64e57a5 100644
--- a/os/windows/posix/include/sys/un.h
+++ b/os/windows/posix/include/sys/un.h
@@ -6,7 +6,7 @@ typedef int in_port_t;
struct sockaddr_un
{
- sa_family_t sun_family; /* Address family */
+ sa_family_t sun_family; /* Address family */
char sun_path[]; /* Socket pathname */
};
--
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
