From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Date: Sat, 2 Jul 2011 01:10:36 +0000 (+1000)
Subject: Merge remote branch 't-nelson/automake'
X-Git-Tag: upstream/1.9.6^2~359
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=2e4db0d14597fdb0013fb16f24b3f872d1217397;p=deb_libnfs.git

Merge remote branch 't-nelson/automake'
---

2e4db0d14597fdb0013fb16f24b3f872d1217397
diff --cc lib/socket.c
index 0bed751,96bc695..dcbd1c1
--- a/lib/socket.c
+++ b/lib/socket.c
@@@ -25,10 -28,10 +28,13 @@@
  #include <rpc/rpc.h>
  #include <rpc/xdr.h>
  #include <arpa/inet.h>
+ #ifdef HAVE_SYS_FILIO_H
+ #include <sys/filio.h>
+ #endif
  #include <sys/ioctl.h>
 +#include <sys/types.h>
 +#include <sys/socket.h>
 +#include <netdb.h>
  #include "libnfs.h"
  #include "libnfs-raw.h"
  #include "libnfs-private.h"