--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-23  Mark D. Baushke  <mdb@gnu.org>
+
+	* stdlib_.h: Treat BSD/OS like OpenBSD.
+
 2006-06-23  Bruno Haible  <bruno@clisp.org>
 
 	* stdlib_.h: Treat IRIX like OpenBSD.

--- a/lib/stdint_.h
+++ b/lib/stdint_.h
@@ -33,11 +33,12 @@
 #if defined(__FreeBSD__) && (__FreeBSD__ >= 3) && (__FreeBSD__ <= 4)
 # include <sys/inttypes.h>
 #endif
-#if defined(__OpenBSD__) || defined(__sgi)
+#if defined(__OpenBSD__) || defined(__bsdi__) || defined(__sgi)
   /* In OpenBSD 3.8, <sys/types.h> includes <machine/types.h>, which defines
      int{8,16,32,64}_t, uint{8,16,32,64}_t and __BIT_TYPES_DEFINED__.
      <inttypes.h> includes <machine/types.h> and also defines intptr_t and
      uintptr_t.  */
+  /* BSD/OS 4.2 is similar, but doesn't have <inttypes.h> */
   /* IRIX 6.5 has <inttypes.h>, and <sys/types.h> defines some of these
      types as well.  */
 # include <sys/types.h>

--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-23  Mark D. Baushke  <mdb@gnu.org>
+
+	* stdint.m4 (gl_STDINT_H): Treat BSD/OS like OpenBSD.
+
 2006-06-26  Simon Josefsson  <jas@extundo.com>
 
 	* inet_ntop.m4: Don't check for sys/types.h, we assume it is

--- a/m4/stdint.m4
+++ b/m4/stdint.m4
@@ -1,4 +1,4 @@
-# stdint.m4 serial 8
+# stdint.m4 serial 9
 dnl Copyright (C) 2001-2002, 2004-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -90,7 +90,7 @@
 #if defined(__FreeBSD__) && (__FreeBSD__ >= 3) && (__FreeBSD__ <= 4)
 # include <sys/inttypes.h>
 #endif
-#if defined(__OpenBSD__) || defined(__sgi)
+#if defined(__OpenBSD__) || defined(__bsdi__) || defined(__sgi)
 # include <sys/types.h>
 # if HAVE_INTTYPES_H
 #  include FULL_PATH_INTTYPES_H