diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2015-04-06 23:28:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-06 23:28:48 +0000 |
| commit | b885106dc7dcc19370b5d5ffc518f6b0e6094f25 (patch) | |
| tree | 3a26d855c7182405aec6ebcc5d60f048f290e455 | |
| parent | ebdc0464dd409b0247c920ab19a9b1260517d5f9 (diff) | |
| parent | 2904e949bb872051618c323c74fcb0e93f67ed09 (diff) | |
| download | system_core-b885106dc7dcc19370b5d5ffc518f6b0e6094f25.zip system_core-b885106dc7dcc19370b5d5ffc518f6b0e6094f25.tar.gz system_core-b885106dc7dcc19370b5d5ffc518f6b0e6094f25.tar.bz2 | |
am 2904e949: am 0bce68b4: am 33c2ad37: Merge "android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS"
* commit '2904e949bb872051618c323c74fcb0e93f67ed09':
android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS
| -rw-r--r-- | include/private/android_filesystem_config.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h index 167f5a1..fed81f8 100644 --- a/include/private/android_filesystem_config.h +++ b/include/private/android_filesystem_config.h @@ -22,6 +22,7 @@ #ifndef _ANDROID_FILESYSTEM_CONFIG_H_ #define _ANDROID_FILESYSTEM_CONFIG_H_ +#include <sys/cdefs.h> #include <sys/types.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 */ -#ifdef __cplusplus -extern "C" { -#endif +__BEGIN_DECLS /* * Used in: @@ -216,9 +215,7 @@ extern "C" { void fs_config(const char *path, int dir, unsigned *uid, unsigned *gid, unsigned *mode, uint64_t *capabilities); -#ifdef __cplusplus -} -#endif +__END_DECLS #endif #endif |