Unify NDK platform headers.
This commit removes duplication of system headers per platform, i.e. remove
copies of common headers like <stdlib.h> from arch-arm/usr/include and arch-x86/usr/include
and move them to a common include directory. More specifically:
- common headers: android-N/arch-A/usr/include --> android-N/include
- arch-specific headers: android-N/arch-A/usr-include --> android-N/arch-A/include
- arch-specific libs: android-N/arch-A/usr/lib --> android-N/arch-A/lib
Change-Id: Ifdba5038d108901931f3e3a7c14ebe6270d2d276
NOTE: This also contains careful separation of API-level-specific headers.
For example, platforms/android-5/include/pthread.h contains new function
declarations that are not available when using platforms/android-3/include/pthread.h
NOTE: The NDK's build-platforms.sh script has been updated to understand the new
layout. This change in develeopment/ndk does not change the layout of
platform files under $NDK/platforms after build-platforms.sh is called.
This commit is contained in:
62
ndk/platforms/android-3/include/linux/nfsd/nfsfh.h
Normal file
62
ndk/platforms/android-3/include/linux/nfsd/nfsfh.h
Normal file
@@ -0,0 +1,62 @@
|
||||
/****************************************************************************
|
||||
****************************************************************************
|
||||
***
|
||||
*** This header was automatically generated from a Linux kernel header
|
||||
*** of the same name, to make information necessary for userspace to
|
||||
*** call into the kernel available to libc. It contains only constants,
|
||||
*** structures, and macros generated from the original header, and thus,
|
||||
*** contains no copyrightable information.
|
||||
***
|
||||
****************************************************************************
|
||||
****************************************************************************/
|
||||
#ifndef _LINUX_NFSD_FH_H
|
||||
#define _LINUX_NFSD_FH_H
|
||||
|
||||
#include <asm/types.h>
|
||||
#include <linux/nfsd/const.h>
|
||||
#include <linux/nfsd/debug.h>
|
||||
|
||||
struct nfs_fhbase_old {
|
||||
__u32 fb_dcookie;
|
||||
__u32 fb_ino;
|
||||
__u32 fb_dirino;
|
||||
__u32 fb_dev;
|
||||
__u32 fb_xdev;
|
||||
__u32 fb_xino;
|
||||
__u32 fb_generation;
|
||||
};
|
||||
|
||||
struct nfs_fhbase_new {
|
||||
__u8 fb_version;
|
||||
__u8 fb_auth_type;
|
||||
__u8 fb_fsid_type;
|
||||
__u8 fb_fileid_type;
|
||||
__u32 fb_auth[1];
|
||||
|
||||
};
|
||||
|
||||
struct knfsd_fh {
|
||||
unsigned int fh_size;
|
||||
union {
|
||||
struct nfs_fhbase_old fh_old;
|
||||
__u32 fh_pad[NFS4_FHSIZE/4];
|
||||
struct nfs_fhbase_new fh_new;
|
||||
} fh_base;
|
||||
};
|
||||
|
||||
#define ofh_dcookie fh_base.fh_old.fb_dcookie
|
||||
#define ofh_ino fh_base.fh_old.fb_ino
|
||||
#define ofh_dirino fh_base.fh_old.fb_dirino
|
||||
#define ofh_dev fh_base.fh_old.fb_dev
|
||||
#define ofh_xdev fh_base.fh_old.fb_xdev
|
||||
#define ofh_xino fh_base.fh_old.fb_xino
|
||||
#define ofh_generation fh_base.fh_old.fb_generation
|
||||
|
||||
#define fh_version fh_base.fh_new.fb_version
|
||||
#define fh_fsid_type fh_base.fh_new.fb_fsid_type
|
||||
#define fh_auth_type fh_base.fh_new.fb_auth_type
|
||||
#define fh_fileid_type fh_base.fh_new.fb_fileid_type
|
||||
#define fh_auth fh_base.fh_new.fb_auth
|
||||
#define fh_fsid fh_base.fh_new.fb_auth
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user