Rename android/config.h to android/config-file.h
This is to avoid naming conflicts later when including
"config.h" in android/main.c to get the correct definition
of TARGET_X86 and other macros.
Change-Id: I4743bf207597721612386213208efe0c7e2f41c5
diff --git a/android/config.c b/android/config-file.c
similarity index 99%
rename from android/config.c
rename to android/config-file.c
index 4f4da46..8e55f4e 100644
--- a/android/config.c
+++ b/android/config-file.c
@@ -16,7 +16,7 @@
#include <unistd.h>
#include <errno.h>
-#include "android/config.h"
+#include "android/config-file.h"
#include "android/utils/eintr_wrapper.h"
#include "android/utils/path.h"
diff --git a/android/config.h b/android/config-file.h
similarity index 95%
rename from android/config.h
rename to android/config-file.h
index 5e8b048..0dad046 100644
--- a/android/config.h
+++ b/android/config-file.h
@@ -9,8 +9,8 @@
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
*/
-#ifndef ANDROID_CONFIG_H
-#define ANDROID_CONFIG_H
+#ifndef ANDROID_CONFIG_FILE_H
+#define ANDROID_CONFIG_FILE_H
/** ANDROID CONFIGURATION FILE SUPPORT
**
@@ -54,4 +54,4 @@
extern int aconfig_int (AConfig *root, const char *name, int _default);
extern const char* aconfig_str (AConfig *root, const char *name, const char *_default);
-#endif /* ANDROID_CONFIG_H */
+#endif /* ANDROID_CONFIG_FILE_H */
diff --git a/android/main-common.h b/android/main-common.h
index 0d184d5..523e441 100644
--- a/android/main-common.h
+++ b/android/main-common.h
@@ -15,7 +15,7 @@
#include <stdint.h>
#include "android/cmdline-option.h"
#include "android/skin/keyset.h"
-#include "android/config.h"
+#include "android/config-file.h"
#include "android/avd/hw-config.h"
/* Common routines used by both android/main.c and android/main-ui.c */
diff --git a/android/main.c b/android/main.c
index e0797d9..f2a55d3 100644
--- a/android/main.c
+++ b/android/main.c
@@ -33,7 +33,7 @@
#include "android/charmap.h"
#include "android/utils/debug.h"
-#include "android/config.h"
+#include "android/config-file.h"
#include "android/config/config.h"
#include "android/user-config.h"
diff --git a/android/qemulator.h b/android/qemulator.h
index bd77ae1..16cafcf 100644
--- a/android/qemulator.h
+++ b/android/qemulator.h
@@ -13,7 +13,7 @@
#ifndef QEMU_ANDROID_QEMULATOR_H
#define QEMU_ANDROID_QEMULATOR_H
-#include "android/config.h"
+#include "android/config-file.h"
#include "android/skin/file.h"
#include "android/skin/keyboard.h"
#include "android/skin/window.h"
diff --git a/android/skin/file.h b/android/skin/file.h
index 21922e6..ab6a3ec 100644
--- a/android/skin/file.h
+++ b/android/skin/file.h
@@ -13,7 +13,7 @@
#define _ANDROID_SKIN_FILE_H
#include "android/skin/image.h"
-#include "android/config.h"
+#include "android/config-file.h"
#include "android/framebuffer.h"
/** Layout
diff --git a/android/skin/keyboard.h b/android/skin/keyboard.h
index 1c3b088..62e1869 100644
--- a/android/skin/keyboard.h
+++ b/android/skin/keyboard.h
@@ -13,7 +13,7 @@
#define _ANDROID_SKIN_KEYBOARD_H
#include "android/charmap.h"
-#include "android/config.h"
+#include "android/config-file.h"
#include "android/skin/image.h" /* for SkinRotation */
#include "android/skin/keyset.h"
#include <SDL.h>
diff --git a/android/skin/keyset.h b/android/skin/keyset.h
index 81eb2e7..7cdcaab 100644
--- a/android/skin/keyset.h
+++ b/android/skin/keyset.h
@@ -12,7 +12,7 @@
#ifndef _ANDROID_SKIN_KEYSET_H_
#define _ANDROID_SKIN_KEYSET_H_
-#include "android/config.h"
+#include "android/config-file.h"
/* A SkinKeySet maps keystrokes to specific commands. we have a few hard-coded
* keysets in the emulator binary, and the user can define its own if he wants