Update rpc headers. Add missing some headers

 -Erik

4 files changed, 48 insertions, 2 deletions

diff --git a/include/rpc/auth.h b/include/rpc/auth.h
index 661295766..b0ff4d5de 100644
--- a/include/rpc/auth.h
+++ b/include/rpc/auth.h
@@ -41,6 +41,17 @@
 #ifndef _RPC_AUTH_H
 
 #define _RPC_AUTH_H	1
+#ifdef _LIBC
+/* Some adjustments to make the libc source from glibc
+ * compile more easily with uClibc... */
+#ifndef __FORCE_GLIBC
+#define __FORCE_GLIBC
+#endif
+#ifndef _GNU_SOUCE
+#define _GNU_SOUCE
+#endif
+#define _(X)	X
+#endif
 #include <features.h>
 #include <rpc/xdr.h>
 
diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h
index e7799ccb1..9236e7205 100644
--- a/include/rpc/rpc.h
+++ b/include/rpc/rpc.h
@@ -38,6 +38,19 @@
 #ifndef _RPC_RPC_H
 #define _RPC_RPC_H 1
 
+#ifdef _LIBC
+/* Some adjustments to make the libc source from glibc
+ * compile more easily with uClibc... */
+#ifndef __FORCE_GLIBC
+#define __FORCE_GLIBC
+#endif
+#ifndef _GNU_SOUCE
+#define _GNU_SOUCE
+#endif
+#define _(X)	X
+#include <features.h>
+#endif
+
 #include <rpc/types.h>		/* some typedefs */
 #include <netinet/in.h>
 
@@ -69,7 +82,6 @@
 
 __BEGIN_DECLS
 
-#if 0
 /* Global variables, protected for multi-threaded applications.  */
 extern fd_set *__rpc_thread_svc_fdset (void) __attribute__ ((__const__));
 #define svc_fdset (*__rpc_thread_svc_fdset ())
@@ -92,7 +104,6 @@ extern struct pollfd **__rpc_thread_svc_pollfd (void)
 
 extern int *__rpc_thread_svc_max_pollfd (void) __attribute__ ((__const__));
 #define svc_max_pollfd (*__rpc_thread_svc_max_pollfd ())
-#endif
 
 __END_DECLS
 
diff --git a/include/rpc/types.h b/include/rpc/types.h
index 8eff8e718..469576e52 100644
--- a/include/rpc/types.h
+++ b/include/rpc/types.h
@@ -33,6 +33,19 @@
 #ifndef _RPC_TYPES_H
 #define _RPC_TYPES_H 1
 
+#ifdef _LIBC
+/* Some adjustments to make the libc source from glibc
+ * compile more easily with uClibc... */
+#ifndef __FORCE_GLIBC
+#define __FORCE_GLIBC
+#endif
+#ifndef _GNU_SOUCE
+#define _GNU_SOUCE
+#endif
+#define _(X)	X
+#endif
+#include <features.h>
+
 typedef int bool_t;
 typedef int enum_t;
 /* This needs to be changed to uint32_t in the future */
diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
index 0b703445a..83707cc19 100644
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -36,6 +36,17 @@
 #ifndef _RPC_XDR_H
 #define _RPC_XDR_H 1
 
+#ifdef _LIBC
+/* Some adjustments to make the libc source from glibc
+ * compile more easily with uClibc... */
+#ifndef __FORCE_GLIBC
+#define __FORCE_GLIBC
+#endif
+#ifndef _GNU_SOUCE
+#define _GNU_SOUCE
+#endif
+#define _(X)	X
+#endif
 #include <features.h>
 #include <sys/types.h>
 #include <rpc/types.h>