diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-15 21:09:48 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-16 09:26:40 +0200 |
| commit | 3c445370a920987433efc97013aef187b6d29737 (patch) | |
| tree | 060c241e129d53d2b155a7f63bde3d3c859a023c /sal/inc | |
| parent | 7d1cfb451bca265ff7ea5e08a9b23b7fdd25e9e2 (diff) | |
Further Android work, now most sal cppunit tests seem to run
Do the LD_LIBRARY_PATH splitting in Java, much easier, and pass the
split up path to the native setup() method.
Use lo_dlopen() in the osl_loadModuleAscii.
Harcode en-US.UTF-8 as the locale for now.
Cut down on verbose logging of stuff that already works.
Diffstat (limited to 'sal/inc')
| -rw-r--r-- | sal/inc/sal/main.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sal/inc/sal/main.h b/sal/inc/sal/main.h index d1d3fffde862..e5e8f3bc0c39 100644 --- a/sal/inc/sal/main.h +++ b/sal/inc/sal/main.h @@ -129,8 +129,6 @@ extern "C" void lo_main(int argc, char **argv); #endif #define SAL_MAIN_WITH_ARGS_IMPL \ -static int sal_main_with_args(int argc, char **argv); \ -\ void lo_main(int argc, char **argv) \ { \ LOGI("in lo_main, argc=%d, argv[0]=%s, argv[1]=%s", argc, argv[0], argv[1]); \ @@ -140,8 +138,6 @@ void lo_main(int argc, char **argv) \ } #define SAL_MAIN_IMPL \ -static int sal_main(void); \ -\ void lo_main(int argc, char **argv) \ { \ LOGI("in lo_main, argc=%d, argv[0]=%s, argv[1]=%s", argc, argv[0], argv[1]); \ |