linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH [nfs-utils]] check for libio.h availability
@ 2013-03-24 21:42 Mike Frysinger
  2013-03-25 14:19 ` Steve Dickson
  0 siblings, 1 reply; 2+ messages in thread
From: Mike Frysinger @ 2013-03-24 21:42 UTC (permalink / raw)
  To: linux-nfs

On some systems (like uClibc), there isn't a libio.h header.  But it
isn't also needed on them.  So check for the header first.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 configure.ac               | 2 +-
 support/include/sockaddr.h | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index f461219..cc7f3b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -358,7 +358,7 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h \
                  stdlib.h string.h sys/file.h sys/ioctl.h sys/mount.h \
                  sys/param.h sys/socket.h sys/time.h sys/vfs.h \
                  syslog.h unistd.h com_err.h et/com_err.h \
-                 ifaddrs.h nfs-plugin.h])
+                 ifaddrs.h nfs-plugin.h libio.h])
 
 dnl *************************************************************
 dnl Checks for typedefs, structures, and compiler characteristics
diff --git a/support/include/sockaddr.h b/support/include/sockaddr.h
index 72766db..a1c30f9 100644
--- a/support/include/sockaddr.h
+++ b/support/include/sockaddr.h
@@ -20,7 +20,13 @@
 #ifndef NFS_UTILS_SOCKADDR_H
 #define NFS_UTILS_SOCKADDR_H
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_LIBIO_H
 #include <libio.h>
+#endif
 #include <stdbool.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-- 
1.8.1.2


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH [nfs-utils]] check for libio.h availability
  2013-03-24 21:42 [PATCH [nfs-utils]] check for libio.h availability Mike Frysinger
@ 2013-03-25 14:19 ` Steve Dickson
  0 siblings, 0 replies; 2+ messages in thread
From: Steve Dickson @ 2013-03-25 14:19 UTC (permalink / raw)
  To: Mike Frysinger; +Cc: linux-nfs



On 24/03/13 17:42, Mike Frysinger wrote:
> On some systems (like uClibc), there isn't a libio.h header.  But it
> isn't also needed on them.  So check for the header first.
> 
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Committed...

steved.
> ---
>  configure.ac               | 2 +-
>  support/include/sockaddr.h | 6 ++++++
>  2 files changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/configure.ac b/configure.ac
> index f461219..cc7f3b4 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -358,7 +358,7 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h \
>                   stdlib.h string.h sys/file.h sys/ioctl.h sys/mount.h \
>                   sys/param.h sys/socket.h sys/time.h sys/vfs.h \
>                   syslog.h unistd.h com_err.h et/com_err.h \
> -                 ifaddrs.h nfs-plugin.h])
> +                 ifaddrs.h nfs-plugin.h libio.h])
>  
>  dnl *************************************************************
>  dnl Checks for typedefs, structures, and compiler characteristics
> diff --git a/support/include/sockaddr.h b/support/include/sockaddr.h
> index 72766db..a1c30f9 100644
> --- a/support/include/sockaddr.h
> +++ b/support/include/sockaddr.h
> @@ -20,7 +20,13 @@
>  #ifndef NFS_UTILS_SOCKADDR_H
>  #define NFS_UTILS_SOCKADDR_H
>  
> +#ifdef HAVE_CONFIG_H
> +#include <config.h>
> +#endif
> +
> +#ifdef HAVE_LIBIO_H
>  #include <libio.h>
> +#endif
>  #include <stdbool.h>
>  #include <sys/socket.h>
>  #include <netinet/in.h>
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-03-25 14:19 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-24 21:42 [PATCH [nfs-utils]] check for libio.h availability Mike Frysinger
2013-03-25 14:19 ` Steve Dickson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).