diff --git a/sunrpc/xdr.c b/sunrpc/xdr.c
index fccc2a5fe5..d20af94b65 100644
--- a/sunrpc/xdr.c
+++ b/sunrpc/xdr.c
@@ -6,23 +6,23 @@
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
- * 
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
+ *
  * Sun RPC is provided with no support and without any obligation on the
  * part of Sun Microsystems, Inc. to assist in its use, correction,
  * modification or enhancement.
- * 
+ *
  * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
  * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
  * OR ANY PART THEREOF.
- * 
+ *
  * In no event will Sun Microsystems, Inc. be liable for any lost revenue
  * or profits or other special, indirect and consequential damages, even if
  * Sun has been advised of the possibility of such damages.
- * 
+ *
  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
@@ -69,7 +69,7 @@ xdr_free(proc, objp)
 	char *objp;
 {
 	XDR x;
-	
+
 	x.x_op = XDR_FREE;
 	(*proc)(&x, objp);
 }
@@ -119,10 +119,13 @@ xdr_int(xdrs, ip)
 	} else if (sizeof (int) == sizeof (short)) {
 		return (xdr_short(xdrs, (short *)ip));
 	} else {
+	  abort ();		/* roland@gnu */
+#if 0
 		/* force unresolved reference (link-time error): */
 		extern unexpected_sizes_in_xdr_int ();
 
 		unexpected_sizes_in_xdr_int();
+#endif
 	}
 #endif
 }
@@ -600,8 +603,8 @@ xdr_string(xdrs, cpp, maxsize)
 	return (FALSE);
 }
 
-/* 
- * Wrapper for xdr_string that can be called directly from 
+/*
+ * Wrapper for xdr_string that can be called directly from
  * routines like clnt_call
  */
 bool_t