commit 57b2a766f7af808f7670aecbe57a18373a903a0d
author David 'Digit' Turner <digit@google.com> Fri Jul 11 13:55:21 2014 +0200
committer David 'Digit' Turner <digit@google.com> Fri Jul 11 13:55:21 2014 +0200
tree 22f077637b8ca00f2637eb4170b69429ba5d72bc
parent 47cdf4186795848aa4f64f9f4cebf5fb43df339a

android/: Add proper C++ inclusion guards.

Change-Id: Ie3f03d967323448eda87f7b4454345323d5bfec0

android/cmdline-option.h

diff --git a/android/cmdline-option.h b/android/cmdline-option.h
index 6fba00a..cb650dd 100644
--- a/android/cmdline-option.h
+++ b/android/cmdline-option.h
@@ -12,6 +12,10 @@
 #ifndef _ANDROID_OPTION_H
 #define _ANDROID_OPTION_H
 
+#include "android/utils/compiler.h"
+
+ANDROID_BEGIN_HEADER
+
 /* a structure used to model a linked list of parameters
  */
 typedef struct ParamList {
@@ -43,4 +47,6 @@
  */
 #define  DEFAULT_DEVICE_DPI  165
 
+ANDROID_END_HEADER
+
 #endif /* _ANDROID_OPTION_H */

android/help.h

diff --git a/android/help.h b/android/help.h
index ee15941..5624823 100644
--- a/android/help.h
+++ b/android/help.h
@@ -12,8 +12,11 @@
 #ifndef _ANDROID_HELP_H
 #define _ANDROID_HELP_H
 
+#include "android/utils/compiler.h"
 #include "android/utils/stralloc.h"
 
+ANDROID_BEGIN_HEADER
+
 /* these values give the maximum length of system property
  * names and values. They must match the definitions for PROPERTY_MAX_NAME and
  * PROPERTY_MAX_VALUE in the Android source tree
@@ -41,4 +44,6 @@
  */
 extern int  android_help_for_topic( const char*  topic, stralloc_t*  out );
 
+ANDROID_END_HEADER
+
 #endif /* _ANDROID_HELP_H */

android/main-common.h

diff --git a/android/main-common.h b/android/main-common.h
index 523e441..38efbd5 100644
--- a/android/main-common.h
+++ b/android/main-common.h
@@ -13,10 +13,13 @@
 #define ANDROID_MAIN_COMMON_H
 
 #include <stdint.h>
-#include "android/cmdline-option.h"
-#include "android/skin/keyset.h"
-#include "android/config-file.h"
 #include "android/avd/hw-config.h"
+#include "android/cmdline-option.h"
+#include "android/config-file.h"
+#include "android/skin/keyset.h"
+#include "android/utils/compiler.h"
+
+ANDROID_BEGIN_HEADER
 
 /* Common routines used by both android/main.c and android/main-ui.c */
 
@@ -103,4 +106,6 @@
  */
 int attach_ui_to_core( AndroidOptions* opts );
 
+ANDROID_END_HEADER
+
 #endif /* ANDROID_MAIN_COMMON_H */