From 581f5ddb1724f469dc7f934f5093179dfb1e05a9 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 20 Dec 2004 16:17:25 +0000 Subject: * configure.ac: Add PATHSEP_C and PATHSEP_S. For W32 let all directories default to c:/gnupg. Require libassuan 0.6.9. * gpg-agent.c (main) [W32]: Now that Mutexes work we can remove the pth_init kludge. (main): Add new options --[no-]use-standard-socket. (check_for_running_agent): Check whether it is running on the standard socket. * sysutils.h [W32]: Define sleep. * util.h: Add prototype for mkdtemp. * call-agent.c (start_agent): Before starting a pipe server start to connect to a server on the standard socket. Use PATHSEP * call-dirmngr.c (start_dirmngr): Use PATHSEP. * import.c: Include unistd.h for dup and close. --- common/sysutils.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'common/sysutils.h') diff --git a/common/sysutils.h b/common/sysutils.h index 9df292031..08198f685 100644 --- a/common/sysutils.h +++ b/common/sysutils.h @@ -28,11 +28,19 @@ const unsigned char *get_session_marker (size_t *rlen); int check_permissions (const char *path,int extension,int checkonly); #ifdef HAVE_W32_SYSTEM +/* Windows declares sleep as obsolete, but provides a definition for + _sleep but non for the still existing sleep. */ +#define sleep(a) _sleep ((a)) + /*-- w32reg.c --*/ char *read_w32_registry_string( const char *root, const char *dir, const char *name ); int write_w32_registry_string(const char *root, const char *dir, const char *name, const char *value); + #endif /*HAVE_W32_SYSTEM*/ + + + #endif /*GNUPG_COMMON_SYSUTILS_H*/ -- cgit v1.2.3