|
@@ -1,8 +1,8 @@
|
|
|
-diff -Nur glibc-2.18.orig/sunrpc/rpc/types.h glibc-2.18/sunrpc/rpc/types.h
|
|
|
|
|
|
-+++ glibc-2.18/sunrpc/rpc/types.h 2013-09-13 08:25:18.000000000 +0200
|
|
|
-@@ -69,19 +69,25 @@
|
|
|
- #include <sys/types.h>
|
|
|
+diff -Nur glibc-2.19.orig/sunrpc/rpc/types.h glibc-2.19/sunrpc/rpc/types.h
|
|
|
+--- glibc-2.19.orig/sunrpc/rpc/types.h 2014-02-07 10:04:38.000000000 +0100
|
|
|
|
|
|
+@@ -74,19 +74,24 @@
|
|
|
+ # define __daddr_t_defined
|
|
|
#endif
|
|
|
|
|
|
-#ifndef __u_char_defined
|
|
@@ -18,15 +18,14 @@ diff -Nur glibc-2.18.orig/sunrpc/rpc/types.h glibc-2.18/sunrpc/rpc/types.h
|
|
|
+typedef unsigned short u_short;
|
|
|
+typedef unsigned int u_int;
|
|
|
+typedef unsigned long u_long;
|
|
|
-+#if __WORDSIZE == 64
|
|
|
++#if __WORDSIZE == 64
|
|
|
++#ifndef __APPLE__
|
|
|
+typedef long int quad_t;
|
|
|
+typedef unsigned long int u_quad_t;
|
|
|
++#endif
|
|
|
+#elif defined __GLIBC_HAVE_LONG_LONG
|
|
|
+typedef long long int quad_t;
|
|
|
+typedef unsigned long long int u_quad_t;
|
|
|
-+#endif
|
|
|
-+#if defined(_CROSS_RPCGEN_)
|
|
|
-+typedef u_quad_t fsid_t;
|
|
|
#endif
|
|
|
-#ifndef __daddr_t_defined
|
|
|
-typedef __daddr_t daddr_t;
|
|
@@ -39,14 +38,14 @@ diff -Nur glibc-2.18.orig/sunrpc/rpc/types.h glibc-2.18/sunrpc/rpc/types.h
|
|
|
# define __daddr_t_defined
|
|
|
#endif
|
|
|
|
|
|
-diff -Nur glibc-2.18.orig/sunrpc/rpc_main.c glibc-2.18/sunrpc/rpc_main.c
|
|
|
|
|
|
-+++ glibc-2.18/sunrpc/rpc_main.c 2013-09-13 08:26:07.000000000 +0200
|
|
|
+diff -Nur glibc-2.19.orig/sunrpc/rpc_main.c glibc-2.19/sunrpc/rpc_main.c
|
|
|
+--- glibc-2.19.orig/sunrpc/rpc_main.c 2014-02-07 10:04:38.000000000 +0100
|
|
|
|
|
|
@@ -38,7 +38,11 @@
|
|
|
#include <stdio.h>
|
|
|
#include <string.h>
|
|
|
#include <unistd.h>
|
|
|
-+#ifdef _CROSS_RPCGEN_
|
|
|
++#ifdef __APPLE__
|
|
|
+#define gettext(X) (X)
|
|
|
+#else
|
|
|
#include <libintl.h>
|
|
@@ -70,14 +69,14 @@ diff -Nur glibc-2.18.orig/sunrpc/rpc_main.c glibc-2.18/sunrpc/rpc_main.c
|
|
|
|
|
|
}
|
|
|
else
|
|
|
-diff -Nur glibc-2.18.orig/sunrpc/rpc_scan.c glibc-2.18/sunrpc/rpc_scan.c
|
|
|
|
|
|
-+++ glibc-2.18/sunrpc/rpc_scan.c 2013-09-13 08:25:18.000000000 +0200
|
|
|
+diff -Nur glibc-2.19.orig/sunrpc/rpc_scan.c glibc-2.19/sunrpc/rpc_scan.c
|
|
|
+--- glibc-2.19.orig/sunrpc/rpc_scan.c 2014-02-07 10:04:38.000000000 +0100
|
|
|
|
|
|
@@ -37,7 +37,11 @@
|
|
|
#include <stdio.h>
|
|
|
#include <ctype.h>
|
|
|
#include <string.h>
|
|
|
-+#ifdef _CROSS_RPCGEN_
|
|
|
++#ifdef __APPLE__
|
|
|
+#define gettext(X) (X)
|
|
|
+#else
|
|
|
#include <libintl.h>
|