Merge "android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS"
This commit is contained in:
commit
33c2ad37ca
1 changed files with 3 additions and 6 deletions
|
|
@ -22,6 +22,7 @@
|
||||||
#ifndef _ANDROID_FILESYSTEM_CONFIG_H_
|
#ifndef _ANDROID_FILESYSTEM_CONFIG_H_
|
||||||
#define _ANDROID_FILESYSTEM_CONFIG_H_
|
#define _ANDROID_FILESYSTEM_CONFIG_H_
|
||||||
|
|
||||||
|
#include <sys/cdefs.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
|
|
@ -199,9 +200,7 @@ struct fs_path_config {
|
||||||
|
|
||||||
/* Rules for directories and files has moved to system/code/libcutils/fs_config.c */
|
/* Rules for directories and files has moved to system/code/libcutils/fs_config.c */
|
||||||
|
|
||||||
#ifdef __cplusplus
|
__BEGIN_DECLS
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Used in:
|
* Used in:
|
||||||
|
|
@ -216,9 +215,7 @@ extern "C" {
|
||||||
void fs_config(const char *path, int dir,
|
void fs_config(const char *path, int dir,
|
||||||
unsigned *uid, unsigned *gid, unsigned *mode, uint64_t *capabilities);
|
unsigned *uid, unsigned *gid, unsigned *mode, uint64_t *capabilities);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
__END_DECLS
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue