--- nfs-utils-2.3.3/support/nfs/svc_socket.c.old	2018-09-06 18:09:08.000000000 +0000
+++ nfs-utils-2.3.3/support/nfs/svc_socket.c	2019-01-10 16:17:02.270000000 +0000
@@ -46,7 +46,7 @@
 	struct rpcent *rpcp;
 	struct servent servbuf, *servp = NULL;
 	int ret = 0;
-#if HAVE_GETRPCBYNUMBER_R
+#ifdef HAVE_GETRPCBYNUMBER_R
 	char rpcdata[1024];
 	struct rpcent rpcbuf;
 
--- nfs-utils-2.3.3/utils/mountd/cache.c.old	2018-09-06 18:09:08.000000000 +0000
+++ nfs-utils-2.3.3/utils/mountd/cache.c	2019-01-10 16:26:22.750000000 +0000
@@ -426,7 +426,7 @@
 	if (count_slashes(p) != count_slashes(parent))
 		return 0;
 
-#if HAVE_NAME_TO_HANDLE_AT
+#ifdef HAVE_NAME_TO_HANDLE_AT
 	struct {
 		struct file_handle fh;
 		unsigned char handle[128];
--- nfs-utils-2.3.3/utils/mount/network.c.old	2018-09-06 18:09:08.000000000 +0000
+++ nfs-utils-2.3.3/utils/mount/network.c	2019-01-10 16:28:46.840000000 +0000
@@ -39,7 +39,7 @@
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
-#if defined(__GLIBC__) && (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 24)
+#if defined(__GLIBC__) && ((__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 24))
 /* Cannot safely include linux/in6.h in old glibc, so hardcode the needed values */
 # define IPV6_PREFER_SRC_PUBLIC 2
 # define IPV6_ADDR_PREFERENCES 72
@@ -1062,7 +1062,7 @@
 	if (caddr) {
 		/* Get the address of our end of this connection */
 		socklen_t len = sizeof(*caddr);
-		if (getsockname(sock, caddr, &len) != 0)
+		if (getsockname(sock, (struct sockaddr *)caddr, &len) != 0)
 			caddr->sin_family = 0;
 	}