Module Name: src
Committed By: christos
Date: Wed Oct 28 15:00:26 UTC 2009
Modified Files:
src/external/bsd/am-utils/dist/include: am_defs.h
Log Message:
Bring in the proper fix from upstream.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/am-utils/dist/include/am_defs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/am-utils/dist/include/am_defs.h
diff -u src/external/bsd/am-utils/dist/include/am_defs.h:1.2 src/external/bsd/am-utils/dist/include/am_defs.h:1.3
--- src/external/bsd/am-utils/dist/include/am_defs.h:1.2 Wed Oct 28 09:08:45 2009
+++ src/external/bsd/am-utils/dist/include/am_defs.h Wed Oct 28 11:00:26 2009
@@ -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 */
/*
