Merge branch 'zdr'

Manually fixyp some merge conflicts in :
	lib/init.c
	lib/pdu.c
	lib/socket.c
	nfs/Makefile.am
	nfs/nfs.x
	nlm/Makefile.am

diff --combined lib/Makefile.am
index 4156a07dcbe9179fc1a9745e9c9e953bf7639fbf,d0bd7fcfa66430571171c589a9b5ad8d00ecba27..1b5a66fb4411d44dc8f13b4d3b4ba6d20e0fbb6b
--- 1/lib/Makefile.am
--- 2/lib/Makefile.am
+++ b/lib/Makefile.am
@@@ -12,10 -12,11 +12,11 @@@ libnfs_la_SOURCES = 
        init.c \
        libnfs.c \
        libnfs-sync.c \
+       libnfs-zdr.c \
        pdu.c \
        socket.c
  
 -libnfs_la_LDFLAGS = -version-info 1:3:0
 +libnfs_la_LDFLAGS = -version-info 1:4:0
  libnfs_la_LIBADD = \
        ../mount/libmount.la \
        ../nfs/libnfs.la \

diff --combined lib/socket.c
index 413ebbe4c8e4009cca6f0ccbc506a5a02b657014,1ba846a1c8151893a8b2237bd8c0f06afa2faa99..83ca50e1765ad365a6f67650edcb01119a133bea
--- 1/lib/socket.c
--- 2/lib/socket.c
+++ b/lib/socket.c
@@@ -34,8 -34,6 +34,6 @@@
  #include <fcntl.h>
  #include <string.h>
  #include <errno.h>
- #include <rpc/rpc.h>
- #include <rpc/xdr.h>
  #ifdef HAVE_SYS_FILIO_H
  #include <sys/filio.h>
  #endif
@@@ -43,6 -41,7 +41,7 @@@
  #include <sys/sockio.h>
  #endif
  #include <sys/types.h>
+ #include "libnfs-zdr.h"
  #include "libnfs.h"
  #include "libnfs-raw.h"
  #include "libnfs-private.h"
@@@ -97,7 -96,7 +96,7 @@@ int rpc_which_events(struct rpc_contex
  
  static int rpc_write_to_socket(struct rpc_context *rpc)
  {
-       int64_t count;
+       int32_t count;
  
        assert(rpc->magic == RPC_CONTEXT_MAGIC);
  
@@@ -140,10 -139,10 +139,12 @@@ static int rpc_read_from_socket(struct 
        int available;
        int size;
        int pdu_size;
-       int64_t count;
+       int32_t count;
+ 
+       assert(rpc->magic == RPC_CONTEXT_MAGIC);
  
 +      assert(rpc->magic == RPC_CONTEXT_MAGIC);
 +
  #if defined(WIN32)
        if (ioctlsocket(rpc->fd, FIONREAD, &available) != 0) {
  #else