diff options
| author |  Hoa V. DINH <dinh.viet.hoa@gmail.com> | 2014-12-10 23:43:01 -0800 |
|---|---|---|
| committer | Hoa V. DINH <dinh.viet.hoa@gmail.com> | 2014-12-10 23:43:01 -0800 |
| commit | d6c39f88b66ad613915b7c9475451f9bbe010046 (patch) | |
| tree | e5b39a3a27ad861c6a4e050dc2ebb91f815fe48f /tests | |
| parent | f6d2ddffc031d8ff6f912f6c2fcad2b4582816a3 (diff) | |
Android: Implemented MCMainThread, implemented certificate verification
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test-all.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/test-all.cpp b/tests/test-all.cpp index 3372811d..9b506792 100644 --- a/tests/test-all.cpp +++ b/tests/test-all.cpp @@ -12,7 +12,7 @@ #if __APPLE__ #include <CoreFoundation/CoreFoundation.h> #endif -#if __linux__ +#if __linux__ && !defined(ANDROID) && !defined(__ANDROID__) #include <glib.h> #endif #ifdef _MSC_VER @@ -22,7 +22,7 @@ static mailcore::String * password = NULL; static mailcore::String * displayName = NULL; static mailcore::String * email = NULL; -#if __linux +#if __linux__ && !defined(ANDROID) && !defined(__ANDROID__) static GMainLoop * s_main_loop = NULL; #endif @@ -42,7 +42,7 @@ static void mainLoop(void) { #if __APPLE__ CFRunLoopRun(); -#elif __linux__ +#elif __linux__ && !defined(ANDROID) && !defined(__ANDROID__) g_main_loop_run(s_main_loop); #elif defined(_MSC_VER) win32MainLoop(); @@ -360,7 +360,7 @@ void testAll() password = MCSTR("MyP4ssw0rd"); displayName = MCSTR("My Email"); -#if __linux__ +#if __linux__ && !defined(ANDROID) && !defined(__ANDROID__) s_main_loop = g_main_loop_new (NULL, FALSE); #endif |