From 0c7b880305305499dd75524bd2a45765029ddf43 Mon Sep 17 00:00:00 2001
From: shadow <shadow>
Date: Fri, 13 Nov 2009 10:05:58 +0000
Subject: [PATCH] build fixes for posix 2008 enviroment

Branch HEAD
b=19808
i=tappro
i=lee@sandia
---
 libsysio/configure.in    | 45 +++++++++++++++++++++++++++++++++++++++++++++
 libsysio/include/sysio.h | 10 ++++++++--
 libsysio/include/xtio.h  | 14 ++++++++++----
 libsysio/src/readdir.c   |  7 ++++++-
 libsysio/src/rw.c        | 11 ++++++-----
 5 files changed, 75 insertions(+), 12 deletions(-)

diff --git a/libsysio/configure.in b/libsysio/configure.in
index 4fcd3c0..5ce600f 100644
--- a/libsysio/configure.in
+++ b/libsysio/configure.in
@@ -360,6 +360,51 @@ if test x$have_st_gen = xyes; then
 	AC_DEFINE(HAVE_GENERATION)
 fi
 
+AC_MSG_CHECKING(for POSIX 2008 preadv)
+tmp_flags="$CFLAGS"
+CFLAGS="$CFLAGS -Wall -Werror"
+AC_TRY_COMPILE([
+#include <sys/uio.h>
+ssize_t preadv (int __fd, const struct iovec *__iovec,
+                int __count, off_t off)
+{
+    return 0;
+}
+],[
+],[
+AC_DEFINE(HAVE_POSIX2008_PREADV, 1, [POSIX 2008 preadv])
+AC_MSG_RESULT(yes)
+],[
+AC_MSG_RESULT(no)
+])
+CFLAGS="$tmp_flags"
+
+AC_MSG_CHECKING(for POSIX 2008 scandir)
+tmp_flags="$CFLAGS"
+CFLAGS="$CFLAGS -Wall -Werror"
+AC_TRY_COMPILE([
+#define _BSD_SOURCE
+
+#include <stdio.h>
+#include <dirent.h>
+
+int scandir(const char *dir,
+	 struct dirent ***namelist,
+	 int(*filter)(const struct dirent *),
+	 int(*compar)(const struct dirent **,
+	              const struct dirent **)
+	);
+
+],[
+], [
+AC_DEFINE(HAVE_POSIX2008_SCANDIR, 1, [POSIX 2008 scandir])
+AC_MSG_RESULT(yes) 
+],[
+AC_MSG_RESULT(no)
+])
+CFLAGS="$tmp_flags"
+
+
 AC_MSG_CHECKING(whether .text pseudo-op must be used)
 AC_CACHE_VAL(am_cv_sysio_asm_dot_text, [dnl
 cat > conftest.s <<EOF
diff --git a/libsysio/include/sysio.h b/libsysio/include/sysio.h
index e64ead5..c9eab42 100644
--- a/libsysio/include/sysio.h
+++ b/libsysio/include/sysio.h
@@ -279,11 +279,17 @@ extern int SYSIO_INTERFACE_NAME(umount)(const char *target);
 extern DIR *SYSIO_INTERFACE_NAME(opendir)(const char *name);
 extern int SYSIO_INTERFACE_NAME(closedir)(DIR *dir);
 extern struct dirent *SYSIO_INTERFACE_NAME(readdir)(DIR *dir);
+
 extern int SYSIO_INTERFACE_NAME(scandir)(const char *dir,
 					 struct dirent ***namelist,
 					 int(*filter)(const struct dirent *),
-					 int(*compar)(const void *,
-						      const void *));
+#ifdef HAVE_POSIX2008_SCANDIR
+					 int(*compar)(const struct dirent **,
+					              const struct dirent **)
+#else
+					 int(*compar)(const void *, const void *)
+#endif
+					);
 #if defined(_BSD_SOURCE) || defined(_SVID_SOURCE)
 extern ssize_t SYSIO_INTERFACE_NAME(getdirentries)(int fd,
 						   char *buf,
diff --git a/libsysio/include/xtio.h b/libsysio/include/xtio.h
index a5798f1..8e67d2e 100644
--- a/libsysio/include/xtio.h
+++ b/libsysio/include/xtio.h
@@ -86,6 +86,12 @@ struct xtvec64 {
 };
 #endif
 
+#ifdef HAVE_POSIX2008_PREADV
+#define _SYSIO_PREADV_T int
+#else
+#define _SYSIO_PREADV_T size_t
+#endif
+
 struct iovec;
 
 /*
@@ -139,7 +145,7 @@ extern ioid_t SYSIO_INTERFACE_NAME(ipread64)(int fd,
  */
 extern ssize_t SYSIO_INTERFACE_NAME(preadv)(int fd,
 					    const struct iovec *iov,
-					    size_t count,
+					    _SYSIO_PREADV_T count,
 					    off_t offset);
 
 #ifdef _LARGEFILE64_SOURCE
@@ -148,7 +154,7 @@ extern ssize_t SYSIO_INTERFACE_NAME(preadv)(int fd,
  */
 extern ssize_t SYSIO_INTERFACE_NAME(pread64v)(int fd,
 					      const struct iovec *iov, 
-					      size_t count,
+					      _SYSIO_PREADV_T count,
 					      off64_t offset);
 #endif
 
@@ -258,7 +264,7 @@ extern ioid_t SYSIO_INTERFACE_NAME(ipwrite64)(int fd,
  */
 extern ssize_t SYSIO_INTERFACE_NAME(pwritev)(int fd,
 					     const struct iovec *iov,
-					     size_t count,
+					     _SYSIO_PREADV_T count,
 					     off_t offset);
 
 #ifdef _LARGEFILE64_SOURCE
@@ -267,7 +273,7 @@ extern ssize_t SYSIO_INTERFACE_NAME(pwritev)(int fd,
  */
 extern ssize_t SYSIO_INTERFACE_NAME(pwrite64v)(int fd,
 					       const struct iovec *iov,
-					       size_t count,
+					       _SYSIO_PREADV_T count,
 					       off64_t offset);
 #endif
 
diff --git a/libsysio/src/readdir.c b/libsysio/src/readdir.c
index c232b29..2633f96 100644
--- a/libsysio/src/readdir.c
+++ b/libsysio/src/readdir.c
@@ -105,7 +105,12 @@ int
 _SCANDIR(const char *dirname, 
 	 _DIRENT_T ***namelist, 
 	 int (*filter) (const _DIRENT_T *), 
-	 int (*compar) (const void *, const void *))
+#ifdef HAVE_POSIX2008_SCANDIR
+	 int(*compar)(const _DIRENT_T **, const  _DIRENT_T **)
+#else
+	 int(*compar)(const void *, const void *)
+#endif
+	)
 {
 	DIR *dir = NULL;
 	_DIRENT_T *de 	  = NULL,
diff --git a/libsysio/src/rw.c b/libsysio/src/rw.c
index 300f073..ebbca58 100644
--- a/libsysio/src/rw.c
+++ b/libsysio/src/rw.c
@@ -487,7 +487,7 @@ SYSIO_INTERFACE_NAME(ipreadv)(int fd,
 static ssize_t
 PREPEND(_, SYSIO_INTERFACE_NAME(preadv))(int fd, 
 					 const struct iovec *iov, 
-					 size_t count, 
+					 _SYSIO_PREADV_T count, 
 					 _SYSIO_OFF_T offset)
 {
 	struct file *fil;
@@ -524,7 +524,7 @@ sysio_sym_weak_alias(PREPEND(_, SYSIO_INTERFACE_NAME(preadv)),
 ssize_t
 SYSIO_INTERFACE_NAME(preadv)(int fd, 
 			     const struct iovec *iov, 
-			     size_t count, 
+			     _SYSIO_PREADV_T count, 
 			     off_t offset)
 {
 
@@ -844,7 +844,8 @@ SYSIO_INTERFACE_NAME(iwritev)(int fd,
 }
 
 ssize_t
-SYSIO_INTERFACE_NAME(writev)(int fd, const struct iovec *iov, int count)
+SYSIO_INTERFACE_NAME(writev)(int fd, const struct iovec *iov,
+			     int count)
 {
 	struct file *fil;
 	struct intnl_xtvec xtvector;
@@ -1015,7 +1016,7 @@ SYSIO_INTERFACE_NAME(ipwritev)(int fd,
 static ssize_t
 PREPEND(_, SYSIO_INTERFACE_NAME(pwritev))(int fd, 
 					  const struct iovec *iov, 
-					  size_t count, 
+					  _SYSIO_PREADV_T count, 
 					  _SYSIO_OFF_T offset)
 {
 	struct file *fil;
@@ -1052,7 +1053,7 @@ sysio_sym_weak_alias(PREPEND(_, SYSIO_INTERFACE_NAME(pwritev)),
 ssize_t
 SYSIO_INTERFACE_NAME(pwritev)(int fd, 
 			      const struct iovec *iov, 
-			      size_t count, 
+			      _SYSIO_PREADV_T count, 
 			      off_t offset)
 {
 
-- 
1.8.3.1