Merge commit 'a2b9adafe46c55a2c26dd46163055bbdf3526835'

diff --cc src/ChangeLog
index fdd3e49619a7fbc76e33df4128a131fcbf629bfa,fe850956151e63cdf3943124808a153c8fda08ed..fbe92be01cef3e42c3b374827464dd4c36c0e102
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,84 -1,9 +1,90 @@@
+ 2011-02-02  Marcus Brinkmann  <mb@g10code.com>
+ 
+       * w32-util.c (mkstemp): Don't use CreateFile instead of open (the
+       function is not used on Windows CE, and the callers were not
+       adjusted).
+ 
 +2011-01-21  Marcus Brinkmann  <mb@g10code.com>
 +
 +      * engine-gpgconf.c (_gpgme_conf_opt_change): Fix the case that is
 +      not self-assignment.
 +
 +2010-12-08  Werner Koch  <wk@g10code.com>
 +
 +      * gpgme-tool.c (strcpy_escaped_plus): New.
 +      (DIM, xtoi_1, xtoi_2): New.
 +      (cmd_keylist): Allow for multiple patterns.
 +
 +2010-11-23  Marcus Brinkmann  <mb@g10code.com>
 +
 +      * w32-io.c (create_reader, create_writer): Use small stack size on
 +      Windows CE.
 +
 +2010-11-23  Marcus Brinkmann  <mb@g10code.com>
 +
 +      * gpgme.h.in (gpgme_conf_arg_new): Make VALUE arg const void *.
 +      * gpgconf.c (_gpgme_conf_arg_new): Likewise.
 +      (gpgme_conf_arg_new): Likewise.
 +      * engine-gpgconf.c (_gpgme_conf_arg_new): Likewise.
 +      (gpgconf_write): Remove debug hack.
 +
 +2010-11-19  Marcus Brinkmann  <mb@g10code.com>
 +
 +      * engine-gpgconf.c (_gpgme_conf_opt_change): Support
 +      self-assignment.  Requested by Marc Mutz.
 +
 +2010-11-17  Marcus Brinkmann  <mb@g10code.com>
 +
 +      * vasprintf.c (int_vasprintf) [HAVE_W32CE_SYSTEM]: Just use a
 +      fixed size buffer, as va_copy is not easy to fake.
 +
 +2010-11-15  Marcus Brinkmann  <mb@g10code.com>
 +
 +      * w32-ce.h (strcasecmp, strdup) [_MSC_VER]: Define.
 +      * genkey.c, passphrase.c: Include util.h.
 +
 +      * w32-util.c (_gpgme_w32ce_get_debug_envvar): Fix return value.
 +
 +2010-11-15  Werner Koch  <wk@g10code.com>
 +
 +      * data-compat.c (gpgme_data_new_from_filepart)
 +      (gpgme_data_new_from_file) [W32CE && _MSC_VER]: Return not
 +      GPG_ERR_NOT_IMPLEMENTED.
 +
 +      * w32-ce.h (HKEY_PERFORMANCE_DATA, HKEY_CURRENT_CONFIG, _IOLBF)
 +      (abort) [_MSC_VER]: Provide these macros.
 +
 +      * ath.h [W32CE && _MSC_VER]: Include winsock2.h.
 +
 +      * ath.c (ath_read, ath_write) [W32CE && _MSC_VER]: Do not call
 +      non-available functions.
 +
 +2010-11-04  Werner Koch  <wk@g10code.com>
 +
 +      * w32-ce.h [_MSC_VER && W32CE]: Undef leave.
 +      * export.c: Include util.h so that we get the above undef.
 +
 +      * memrchr.c: Remove.  Used to be a replacement function required
 +      by the formerly included assuan code.
 +
 +2010-11-03  Werner Koch  <wk@g10code.com>
 +
 +      * debug.c (_gpgme_debug) [W32CE]: Replace locatime by GetLocalTime.
 +
 +      * signers.c (gpgme_signers_clear): Remove useless return.
 +      Reported by Patrick Spendrin.
 +
 +      * w32-util.c: s/__inline__/GPG_ERR_INLINE/
 +
 +      * setenv.c: Include string.h due to our strerror replacement.
 +
 +      * w32-ce.h (access, bsearch): New macros.
 +      * w32-ce.c (_gpgme_wince_access): New.
 +      (RegQueryValueExA): Change DATA to a void*.
 +      (_gpgme_wince_bsearch): New.  Taken from glibc 2.6.
 +
 +      Guard include of sys/stat.h and sys/types.h.
 +
  2010-11-02  Werner Koch  <wk@g10code.com>
  
        * data-fd.c (read, write, lseek) [W32CE && ! __MINGW32CE__]: New.

diff --cc src/w32-util.c
Simple merge