From ea283cd792ea5b967c8f9dc5842fca6c2281cdd6 Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Sun, 13 Jul 2014 15:36:59 -0700 Subject: [PATCH] RPC: include libnfs-zdr.h from all raw libnfs-raw-*.h files Include the zdr header from all raw lowlevel headers so that we don't have to include it manually from apps. Signed-off-by: Ronnie Sahlberg --- mount/Makefile.am | 2 +- mount/libnfs-raw-mount.h | 2 +- nfs/Makefile.am | 2 +- nfs/libnfs-raw-nfs.h | 2 +- nlm/Makefile.am | 2 +- nlm/libnfs-raw-nlm.h | 2 +- nsm/Makefile.am | 2 +- nsm/libnfs-raw-nsm.h | 2 +- portmap/Makefile.am | 2 +- portmap/libnfs-raw-portmap.h | 2 +- rquota/Makefile.am | 2 +- rquota/libnfs-raw-rquota.h | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mount/Makefile.am b/mount/Makefile.am index 6daa808..5a9c65e 100644 --- a/mount/Makefile.am +++ b/mount/Makefile.am @@ -19,6 +19,6 @@ mount-stamp : mount.x compile_rpc: cat mount.x | head -29 >libnfs-raw-mount.h - rpcgen -h mount.x | sed -e "s/#include //" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-mount.h + rpcgen -h mount.x | sed -e "s/#include /#include /" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-mount.h cat mount.x | head -29 >libnfs-raw-mount.c rpcgen -c mount.x | sed -e "s/#include \".*mount.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-mount.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n buf = NULL;/" -e "s/bool_t/uint32_t/g" >> libnfs-raw-mount.c diff --git a/mount/libnfs-raw-mount.h b/mount/libnfs-raw-mount.h index 06fdcae..23ca6ba 100644 --- a/mount/libnfs-raw-mount.h +++ b/mount/libnfs-raw-mount.h @@ -35,7 +35,7 @@ either expressed or implied, of the FreeBSD Project. #ifndef _MOUNT_H_RPCGEN #define _MOUNT_H_RPCGEN - +#include #ifdef __cplusplus diff --git a/nfs/Makefile.am b/nfs/Makefile.am index 5faee61..c155372 100644 --- a/nfs/Makefile.am +++ b/nfs/Makefile.am @@ -19,6 +19,6 @@ nfs-stamp : nfs.x compile_rpc: cat nfs.x | head -29 >libnfs-raw-nfs.h - rpcgen -h nfs.x | sed -e "s/#include //" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/#define _NFS_H_RPCGEN/#define _NFS_H_RPCGEN\n#include /g" -e "s/#define NFS3_COOKIEVERFSIZE 8/#define NFS3_COOKIEVERFSIZE 8\n\n#if defined(ANDROID)\ntypedef long long int quad_t;\ntypedef long long unsigned u_quad_t;\n#endif\n#if defined(WIN32)\ntypedef long long int quad_t;\ntypedef long long unsigned u_quad_t;\n#endif/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-nfs.h + rpcgen -h nfs.x | sed -e "s/#include /#include /" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/#define _NFS_H_RPCGEN/#define _NFS_H_RPCGEN\n#include /g" -e "s/#define NFS3_COOKIEVERFSIZE 8/#define NFS3_COOKIEVERFSIZE 8\n\n#if defined(ANDROID)\ntypedef long long int quad_t;\ntypedef long long unsigned u_quad_t;\n#endif\n#if defined(WIN32)\ntypedef long long int quad_t;\ntypedef long long unsigned u_quad_t;\n#endif/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-nfs.h cat nfs.x | head -29 >libnfs-raw-nfs.c rpcgen -c nfs.x | sed -e "s/#include \".*nfs.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nfs.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n buf = NULL;/" -e "s/bool_t/uint32_t/g" >> libnfs-raw-nfs.c diff --git a/nfs/libnfs-raw-nfs.h b/nfs/libnfs-raw-nfs.h index 8837d3d..835029e 100644 --- a/nfs/libnfs-raw-nfs.h +++ b/nfs/libnfs-raw-nfs.h @@ -36,7 +36,7 @@ either expressed or implied, of the FreeBSD Project. #define _NFS_H_RPCGEN #include - +#include #ifdef __cplusplus diff --git a/nlm/Makefile.am b/nlm/Makefile.am index 3ed74b7..dd91cb9 100644 --- a/nlm/Makefile.am +++ b/nlm/Makefile.am @@ -19,6 +19,6 @@ nlm-stamp : nlm.x compile_rpc: cat nlm.x | head -29 >libnfs-raw-nlm.h - rpcgen -h nlm.x | sed -e "s/#include //" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-nlm.h + rpcgen -h nlm.x | sed -e "s/#include /#include /" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-nlm.h cat nlm.x | head -29 >libnfs-raw-nlm.c rpcgen -c nlm.x | sed -e "s/#include \".*nlm.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nlm.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n buf = NULL;/" -e "s/bool_t/uint32_t/g" >> libnfs-raw-nlm.c diff --git a/nlm/libnfs-raw-nlm.h b/nlm/libnfs-raw-nlm.h index 15374e7..ce85259 100644 --- a/nlm/libnfs-raw-nlm.h +++ b/nlm/libnfs-raw-nlm.h @@ -35,7 +35,7 @@ either expressed or implied, of the FreeBSD Project. #ifndef _NLM_H_RPCGEN #define _NLM_H_RPCGEN - +#include #ifdef __cplusplus diff --git a/nsm/Makefile.am b/nsm/Makefile.am index e0dcfaf..9e45099 100644 --- a/nsm/Makefile.am +++ b/nsm/Makefile.am @@ -19,6 +19,6 @@ nsm-stamp : nsm.x compile_rpc: cat nsm.x | head -29 >libnfs-raw-nsm.h - rpcgen -h nsm.x | sed -e "s/#include //" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-nsm.h + rpcgen -h nsm.x | sed -e "s/#include /#include /" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-nsm.h cat nsm.x | head -29 >libnfs-raw-nsm.c rpcgen -c nsm.x | sed -e "s/#include \".*nsm.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nsm.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n buf = NULL;/" -e "s/bool_t/uint32_t/g" >> libnfs-raw-nsm.c diff --git a/nsm/libnfs-raw-nsm.h b/nsm/libnfs-raw-nsm.h index 3c3d296..e35e0c2 100644 --- a/nsm/libnfs-raw-nsm.h +++ b/nsm/libnfs-raw-nsm.h @@ -35,7 +35,7 @@ either expressed or implied, of the FreeBSD Project. #ifndef _NSM_H_RPCGEN #define _NSM_H_RPCGEN - +#include #ifdef __cplusplus diff --git a/portmap/Makefile.am b/portmap/Makefile.am index a1d9c07..5fcccfa 100644 --- a/portmap/Makefile.am +++ b/portmap/Makefile.am @@ -19,6 +19,6 @@ portmap-stamp : portmap.x compile_rpc: cat portmap.x | head -29 >libnfs-raw-portmap.h - rpcgen -h portmap.x | sed -e "s/#include //" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-portmap.h + rpcgen -h portmap.x | sed -e "s/#include /#include /" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-portmap.h cat portmap.x | head -29 >libnfs-raw-portmap.c rpcgen -c portmap.x | sed -e "s/#include \".*portmap.h\"/#include \"libnfs-zdr.h\"\n#include \"libnfs-raw-portmap.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n buf = NULL;/" -e "s/bool_t/uint32_t/g" >> libnfs-raw-portmap.c diff --git a/portmap/libnfs-raw-portmap.h b/portmap/libnfs-raw-portmap.h index 4c3fc90..6036de9 100644 --- a/portmap/libnfs-raw-portmap.h +++ b/portmap/libnfs-raw-portmap.h @@ -35,7 +35,7 @@ either expressed or implied, of the FreeBSD Project. #ifndef _PORTMAP_H_RPCGEN #define _PORTMAP_H_RPCGEN - +#include #ifdef __cplusplus diff --git a/rquota/Makefile.am b/rquota/Makefile.am index a82b9fb..fae3e1a 100644 --- a/rquota/Makefile.am +++ b/rquota/Makefile.am @@ -19,6 +19,6 @@ rquota-stamp : rquota.x compile_rpc: cat rquota.x | head -29 >libnfs-raw-rquota.h - rpcgen -h rquota.x | sed -e "s/#include //" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-rquota.h + rpcgen -h rquota.x | sed -e "s/#include /#include /" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-rquota.h cat rquota.x | head -29 >libnfs-raw-rquota.c rpcgen -c rquota.x | sed -e "s/#include \".*rquota.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-rquota.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n buf = NULL;/" -e "s/bool_t/uint32_t/g" >> libnfs-raw-rquota.c diff --git a/rquota/libnfs-raw-rquota.h b/rquota/libnfs-raw-rquota.h index 2d75703..27ea104 100644 --- a/rquota/libnfs-raw-rquota.h +++ b/rquota/libnfs-raw-rquota.h @@ -35,7 +35,7 @@ either expressed or implied, of the FreeBSD Project. #ifndef _RQUOTA_H_RPCGEN #define _RQUOTA_H_RPCGEN - +#include #ifdef __cplusplus -- 2.34.1