ZDR: remove dependency on zdr.h from the examples and nfs-ls

[deb_libnfs.git] / examples / nfsclient-bcast.c

diff --git a/examples/nfsclient-bcast.c b/examples/nfsclient-bcast.c
index 498e0e7f4fcbad8c4b79ec84533cbe9d930cf849..ec19a69f958b23ed0f3c4b9949268f294f73250e 100644 (file)
--- a/examples/nfsclient-bcast.c
+++ b/examples/nfsclient-bcast.c
@@ -17,21 +17,50 @@
 
 /* Example program using the lowlevel raw broadcast interface.
  */
-
+#ifdef HAVE_CONFIG_H
 #include "config.h"
-#include <stdio.h>
+#endif
+
+#ifdef WIN32
+#include "win32_compat.h"
+#endif
+
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <poll.h>
 #include <errno.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
+
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
+
+#ifdef HAVE_NET_IF_H
 #include <net/if.h>
+#endif
+
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif
+
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
 #include "libnfs.h"
 #include "libnfs-raw.h"
+#include "libnfs-private.h"
 #include "libnfs-raw-mount.h"
 #include "libnfs-raw-portmap.h"
 
@@ -182,7 +211,7 @@ int main(int argc _U_, char *argv[] _U_)
                        exit(10);
                }
 
-               if (rpc_pmap_callit_async(rpc, MOUNT_PROGRAM, 2, 0, NULL, 0, pm_cb, &data) < 0) {
+               if (rpc_pmap2_callit_async(rpc, MOUNT_PROGRAM, 2, 0, NULL, 0, pm_cb, &data) < 0) {
                        printf("Failed to set up callit function\n");
                        exit(10);
                }