$NetBSD: patch-ab,v 1.5 2005/12/13 14:25:01 joerg Exp $ --- iozone.c.orig 2005-12-13 14:04:05.000000000 +0000 +++ iozone.c @@ -61,12 +61,7 @@ #include int errno; #else -#if defined(linux) #include -#else -extern int errno; /* imported for errors */ -extern int h_errno; /* imported for errors */ -#endif #endif @@ -251,15 +246,15 @@ THISVERSION, #include #include -#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__APPLE__) +#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__APPLE__) && !defined(__DragonFly__) #include #endif -#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) #include #include #endif -#if defined (__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) +#if defined (__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__DragonFly__) #ifndef O_SYNC #define O_SYNC O_FSYNC #endif @@ -296,25 +291,18 @@ THISVERSION, #define MAP_FAILED -1 #endif -#ifdef generic +#if defined(__DragonFly__) +#define __off64_t_defined +typedef off_t off64_t; +#elif defined(generic) typedef long long off64_t; #endif -#ifndef solaris -#ifndef off64_t -#ifndef _OFF64_T -#ifndef __AIX__ -#ifndef __off64_t_defined -#ifndef SCO_Unixware_gcc -#ifndef UWIN +#if !defined(solaris) && !defined(off64_t) && !defined(_OFF64_T) && \ + !defined(__AIX__) && !defined(__off64_t_defined) && \ + !defined(SCO_Unixware_gcc) && !defined(UWIN) typedef long long off64_t; #endif -#endif -#endif -#endif -#endif -#endif -#endif #ifdef __AIX__ #include @@ -325,7 +313,7 @@ typedef long long off64_t; #endif #ifdef unix -#if defined (__APPLE__) || defined(__FreeBSD__) +#if defined (__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__) #include #endif #include @@ -357,7 +345,7 @@ typedef long long off64_t; #define MS_ASYNC 0 #endif -#ifdef bsd4_4 +#if defined(bsd4_4) || defined(__DragonFly__) #define MAP_ANONYMOUS MAP_ANON #endif