diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/ChangeLog | 7 | ||||
| -rw-r--r-- | common/init.c | 19 | ||||
| -rw-r--r-- | common/utf8conv.c | 5 |
3 files changed, 25 insertions, 6 deletions
diff --git a/common/ChangeLog b/common/ChangeLog index 4dd266e0f..e9e3e509a 100644 --- a/common/ChangeLog +++ b/common/ChangeLog @@ -1,3 +1,10 @@ +2010-04-26 Werner Koch <[email protected]> + + * utf8conv.c (load_libiconv) [W32CE]: No libiconv warning + + * init.c (init_common_subsystems) [W32CE]: Register the sleep + function before es_init. + 2010-04-20 Werner Koch <[email protected]> * estream.c (es_deinit): New. diff --git a/common/init.c b/common/init.c index ce661f6c5..aa0b6a7ca 100644 --- a/common/init.c +++ b/common/init.c @@ -73,13 +73,21 @@ init_common_subsystems (int *argcp, char ***argvp) # ifdef HAVE_PTH pth_init (); # else - { - WSADATA wsadat; - - WSAStartup (0x202, &wsadat); - } + { + WSADATA wsadat; + + WSAStartup (0x202, &wsadat); + } # endif /*!HAVE_PTH*/ #endif + +#ifdef HAVE_W32CE_SYSTEM + /* Register the sleep exit function before the estream init so that + the sleep will be called after the estream registered atexit + function which flushes the left open estream streams and in + particular es_stdout. */ + atexit (sleep_on_exit); +#endif /* Initialize the Estream library. */ es_init (); @@ -87,7 +95,6 @@ init_common_subsystems (int *argcp, char ***argvp) /* Special hack for Windows CE: We extract some options from arg to setup the standard handles. */ #ifdef HAVE_W32CE_SYSTEM - atexit (sleep_on_exit); parse_std_file_handles (argcp, argvp); #else (void)argcp; diff --git a/common/utf8conv.c b/common/utf8conv.c index 6cbe4e92c..4ad514247 100644 --- a/common/utf8conv.c +++ b/common/utf8conv.c @@ -62,6 +62,10 @@ static int (* __stdcall iconv_close) (iconv_t cd); static int load_libiconv (void) { +#ifdef HAVE_W32CE_SYSTEM + return -1; /* FIXME No libiconv yet - Need to investigate whether it + is at all required. */ +#else static int done; if (!done) @@ -94,6 +98,7 @@ load_libiconv (void) } } return iconv_open? 0: -1; +#endif } #endif /*HAVE_W32_SYSTEM*/ |