$OpenBSD: patch-ar_h,v 1.1 2006/04/07 07:40:18 pvalchev Exp $
--- ar.h.orig	Fri Apr 30 22:04:22 1993
+++ ar.h	Fri Apr  7 01:38:55 2006
@@ -15,11 +15,11 @@ Adapted from "ar" archiver written by Ha
 /* uchar should be 8 bits or more */
 /* typedef unsigned char  uchar;   -- already in zoo.h */
 
+#ifndef _SYS_TYPES_H_
 typedef unsigned int   uint;    /* 16 bits or more */
-#if !defined(__386BSD__) || !defined(_TYPES_H_)
 typedef unsigned short ushort;  /* 16 bits or more */
-#endif
 typedef unsigned long  ulong;   /* 32 bits or more */
+#endif
 
 /* T_UINT16 must be #defined in options.h to be 
 a 16-bit unsigned integer type */