commit 47cdf4186795848aa4f64f9f4cebf5fb43df339a
author David 'Digit' Turner <digit@google.com> Fri Jul 11 11:39:56 2014 +0200
committer David 'Digit' Turner <digit@google.com> Fri Jul 11 11:39:56 2014 +0200
tree 2e2e914ed6906ba33a99c169fdcd7d9d87ecd4e3
parent c13a6a2c94ac033582e2cc7716354b9d079281a6

android/avd: Add proper C++ inclusion guards.

Change-Id: I59c1c4fc4559967b8f9a5fa0f56dfda62684a0a7

android/avd/hw-config.h

diff --git a/android/avd/hw-config.h b/android/avd/hw-config.h
index 82a3a5e..df9f1f0 100644
--- a/android/avd/hw-config.h
+++ b/android/avd/hw-config.h
@@ -13,8 +13,11 @@
 #define _ANDROID_AVD_HW_CONFIG_H
 
 #include <stdint.h>
+#include "android/utils/compiler.h"
 #include "android/utils/ini.h"
 
+ANDROID_BEGIN_HEADER
+
 typedef char      hw_bool_t;
 typedef int       hw_int_t;
 typedef int64_t   hw_disksize_t;
@@ -86,4 +89,6 @@
 // kernel.newDeviceNaming.
 const char* androidHwConfig_getKernelSerialPrefix( AndroidHwConfig* config );
 
+ANDROID_END_HEADER
+
 #endif /* _ANDROID_AVD_HW_CONFIG_H */

android/avd/info.h

diff --git a/android/avd/info.h b/android/avd/info.h
index d2b0b74..f0fc1db 100644
--- a/android/avd/info.h
+++ b/android/avd/info.h
@@ -12,11 +12,14 @@
 #ifndef ANDROID_AVD_INFO_H
 #define ANDROID_AVD_INFO_H
 
+#include "android/utils/compiler.h"
 #include "android/utils/ini.h"
 #include "android/avd/hw-config.h"
 #include "android/config/config.h"
 #include "android/utils/file_data.h"
 
+ANDROID_BEGIN_HEADER
+
 /* An Android Virtual Device (AVD for short) corresponds to a
  * directory containing all kernel/disk images for a given virtual
  * device, as well as information about its hardware capabilities,
@@ -284,6 +287,6 @@
 */
 int          avdInfo_getSnapshotPresent(AvdInfo* i);
 
-/* */
+ANDROID_END_HEADER
 
 #endif /* ANDROID_AVD_INFO_H */