$NetBSD: patch-aa,v 1.2 2006/01/09 20:02:02 joerg Exp $ --- 7plus.h.orig 2000-01-10 15:03:02.000000000 +0000 +++ 7plus.h @@ -207,7 +207,7 @@ #ifdef __unix__ - #if defined(__i386__) && !defined(__NetBSD__) + #if defined(__i386__) && !defined(__NetBSD__) && !defined(__DragonFly__) #ifndef SYSV #define SYSV #endif @@ -225,9 +225,15 @@ #include #include #include + #ifndef S_IREAD + #define S_IREAD S_IRUSR + #endif + #ifndef S_IWRITE + #define S_IWRITE S_IWUSR + #endif #endif /* __linux__ */ - #ifdef __NetBSD__ + #if defined(__NetBSD__) || defined(__DragonFly__) #define _HAVE_STRSTR #define _HAVE_RENAME #define _HAVE_GMTIME @@ -251,7 +257,7 @@ #include struct termio sg[2]; #else - #ifdef __NetBSD__ + #if defined(__NetBSD__) || defined(__DragonFly__) #include #include struct termios sg[2]; @@ -262,7 +268,7 @@ #endif /* SYSV */ /* assumed limits (hope reasonable !!! DF6NL) */ - #if defined(__linux__) || defined(__NetBSD__) + #if defined(__linux__) || defined(__NetBSD__) || defined(__DragonFly__) #define MAXPATH PATH_MAX /* defined in linux/limits.h DL5MLO */ #define MAXFILE NAME_MAX #define MAXEXT NAME_MAX /* you can a.asdfasdfasdfasfa */ @@ -343,7 +349,7 @@ /** shorthands for unsigned types **/ typedef unsigned char byte; /* 8bit unsigned char */ -#ifdef __unix__ +#if defined(__unix__) && !defined(__linux__) && !defined(__DragonFly__) #ifdef __vax__ typedef u_long ulong; #endif