summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2015-04-06 22:43:22 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-06 22:43:22 +0000
commit0bce68b421a65daf212c3f17834912830fb418b4 (patch)
tree8af0478ad08b79c9e81675e7c194fd890d978e22
parentdcc7aadb96e3c408d301377827de24f5f9bfe63f (diff)
parent33c2ad37cac1d85272bd0f8f869710cac73d3bb7 (diff)
downloadsystem_core-0bce68b421a65daf212c3f17834912830fb418b4.zip
system_core-0bce68b421a65daf212c3f17834912830fb418b4.tar.gz
system_core-0bce68b421a65daf212c3f17834912830fb418b4.tar.bz2
am 33c2ad37: Merge "android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS"
* commit '33c2ad37cac1d85272bd0f8f869710cac73d3bb7': android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS
-rw-r--r--include/private/android_filesystem_config.h9
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