[src/trunk]: src/external/bsd/am-utils/dist/include Bring in the proper fix f...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6d4c66056fa2
branches:  trunk
changeset: 748589:6d4c66056fa2
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Oct 28 15:00:26 2009 +0000

description:
Bring in the proper fix from upstream.

diffstat:

 external/bsd/am-utils/dist/include/am_defs.h |  21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)

diffs (42 lines):

diff -r 9eb3bba06512 -r 6d4c66056fa2 external/bsd/am-utils/dist/include/am_defs.h
--- a/external/bsd/am-utils/dist/include/am_defs.h      Wed Oct 28 13:08:45 2009 +0000
+++ b/external/bsd/am-utils/dist/include/am_defs.h      Wed Oct 28 15:00:26 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: am_defs.h,v 1.2 2009/10/28 13:08:45 christos Exp $     */
+/*     $NetBSD: am_defs.h,v 1.3 2009/10/28 15:00:26 christos Exp $     */
 
 /*
  * Copyright (c) 1997-2009 Erez Zadok
@@ -321,17 +321,6 @@
 # include <mntent.h>
 #endif /* HAVE_MNTENT_H */
 
-/*
- * Actions to take if <sys/errno.h> exists.
- */
-#ifdef HAVE_SYS_ERRNO_H
-# ifdef __NetBSD__
-#  include <errno.h>
-# else
-#  include <sys/errno.h>
-extern int errno;
-# endif
-#endif /* HAVE_SYS_ERRNO_H */
 
 /*
  * Actions to take if <sys/fsid.h> exists.
@@ -937,6 +926,14 @@
  */
 #ifdef HAVE_ERRNO_H
 # include <errno.h>
+#else
+/*
+ * Actions to take if <sys/errno.h> exists.
+ */
+# ifdef HAVE_SYS_ERRNO_H
+# include <sys/errno.h>
+extern int errno;
+# endif /* HAVE_SYS_ERRNO_H */
 #endif /* HAVE_ERRNO_H */
 
 /*