summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2010-09-01 23:36:20 +0000
committerThomas Martitz <kugel@rockbox.org>2010-09-01 23:36:20 +0000
commit8ec51135b6733491e4980925a919e926609674fe (patch)
treeddd3a668601acaa5884124d1ddee4967364bbeec
parentf05cdc46f23bf28d31dfc4fc2ebe4d20e4d6f961 (diff)
downloadrockbox-8ec51135b6733491e4980925a919e926609674fe.tar.gz
rockbox-8ec51135b6733491e4980925a919e926609674fe.zip
Android: Fix two warnings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27975 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/target/hosted/android/dir-target.h1
-rw-r--r--firmware/target/hosted/android/system-android.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/firmware/target/hosted/android/dir-target.h b/firmware/target/hosted/android/dir-target.h
index 4516215d62..44ea23d4ad 100644
--- a/firmware/target/hosted/android/dir-target.h
+++ b/firmware/target/hosted/android/dir-target.h
@@ -33,5 +33,6 @@ extern DIR* _opendir(const char* name);
33extern int _mkdir(const char* name); 33extern int _mkdir(const char* name);
34extern int _closedir(DIR* dir); 34extern int _closedir(DIR* dir);
35extern struct dirent *_readdir(DIR* dir); 35extern struct dirent *_readdir(DIR* dir);
36extern void fat_size(unsigned long *size, unsigned long *free);
36 37
37#endif /* __DIR_TARGET_H__ */ 38#endif /* __DIR_TARGET_H__ */
diff --git a/firmware/target/hosted/android/system-android.c b/firmware/target/hosted/android/system-android.c
index 87b6584135..7d1fe9d458 100644
--- a/firmware/target/hosted/android/system-android.c
+++ b/firmware/target/hosted/android/system-android.c
@@ -39,6 +39,7 @@ uintptr_t *stackbegin;
39uintptr_t *stackend; 39uintptr_t *stackend;
40 40
41extern int main(void); 41extern int main(void);
42extern void powermgmt_init_target(void);
42/* this is the entry point of the android app initially called by jni */ 43/* this is the entry point of the android app initially called by jni */
43JNIEXPORT void JNICALL 44JNIEXPORT void JNICALL
44Java_org_rockbox_RockboxService_main(JNIEnv *env, jobject this) 45Java_org_rockbox_RockboxService_main(JNIEnv *env, jobject this)
@@ -56,7 +57,8 @@ Java_org_rockbox_RockboxService_main(JNIEnv *env, jobject this)
56 RockboxService_instance = this; 57 RockboxService_instance = this;
57 RockboxService_class = (*env)->GetObjectClass(env, this); 58 RockboxService_class = (*env)->GetObjectClass(env, this);
58 59
59 60 /* no better place yet, most of powermgmt.c is #ifdef'd out for non-native
61 * builds */
60 powermgmt_init_target(); 62 powermgmt_init_target();
61 main(); 63 main();
62} 64}