--- tcsh-6.17.00.orig/sh.h 2009-06-25 23:27:37.000000000 +0200 +++ tcsh-6.17.00/sh.h 2010-07-31 19:48:01.000000000 +0200 @@ -338,7 +338,7 @@ static inline void ignore(intptr_t a) # include #endif /* (!FIOCLEX && SUNOS4) || (SYSVREL == 4 && !_SEQUENT_ && !SCO && !_SX ) */ -#if !defined(_MINIX) && !defined(supermax) && !defined(WINNT_NATIVE) && !defined(IRIS4D) +#if !defined(_MINIX) && !defined(supermax) && !defined(WINNT_NATIVE) && !defined(IRIS4D) && !defined(__FreeBSD__) # include #endif /* !_MINIX && !supermax && !WINNT_NATIVE && !defined(IRIS4D) */ @@ -375,9 +375,11 @@ static inline void ignore(intptr_t a) #include #include #endif /* WINNT_NATIVE */ +#if !defined(BSD) #ifdef HAVE_SHADOW_H # include #endif /* HAVE_SHADOW_H */ +#endif #ifdef HAVE_AUTH_H # include #endif /* HAVE_AUTH_H */