From 8d7b8e573f54df27aef812644b3d1b70b25d7fb6 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sun, 23 Mar 2003 20:11:45 +0000 Subject: [PATCH] Portability fixes. --- configure | 2 ++ configure.ac | 1 + include/config.h.in | 3 +++ libs/port/mkstemps.c | 6 ++++++ libs/port/usleep.c | 2 ++ libs/unicode/Makefile.in | 2 +- 6 files changed, 15 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 1bf05d5e03d..8f7e74bad16 100755 --- a/configure +++ b/configure @@ -13194,6 +13194,7 @@ fi + for ac_func in \ @@ -13218,6 +13219,7 @@ for ac_func in \ getprotobynumber \ getpwuid \ getservbyport \ + gettimeofday \ inet_network \ lseek64 \ lstat \ diff --git a/configure.ac b/configure.ac index 506c3f517f3..98c767e90c6 100644 --- a/configure.ac +++ b/configure.ac @@ -950,6 +950,7 @@ AC_CHECK_FUNCS(\ getprotobynumber \ getpwuid \ getservbyport \ + gettimeofday \ inet_network \ lseek64 \ lstat \ diff --git a/include/config.h.in b/include/config.h.in index b7a0808f060..c60f018dc2c 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -149,6 +149,9 @@ /* Define to 1 if you have the `getservbyport' function. */ #undef HAVE_GETSERVBYPORT +/* Define to 1 if you have the `gettimeofday' function. */ +#undef HAVE_GETTIMEOFDAY + /* Define to 1 if you have the header file. */ #undef HAVE_GIF_LIB_H diff --git a/libs/port/mkstemps.c b/libs/port/mkstemps.c index 90620b8fa25..f6674334744 100644 --- a/libs/port/mkstemps.c +++ b/libs/port/mkstemps.c @@ -71,7 +71,9 @@ mkstemps (template, suffix_len) static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; static gcc_uint64_t value; +#ifdef HAVE_GETTIMEOFDAY struct timeval tv; +#endif char *XXXXXX; size_t len; int count; @@ -86,9 +88,13 @@ mkstemps (template, suffix_len) XXXXXX = &template[len - 6 - suffix_len]; +#ifdef HAVE_GETTIMEOFDAY /* Get some more or less random data. */ gettimeofday (&tv, NULL); value += ((gcc_uint64_t) tv.tv_usec << 16) ^ tv.tv_sec ^ getpid (); +#else + value += getpid (); +#endif for (count = 0; count < TMP_MAX; ++count) { diff --git a/libs/port/usleep.c b/libs/port/usleep.c index 6357c949f5d..b72a07e07cf 100644 --- a/libs/port/usleep.c +++ b/libs/port/usleep.c @@ -21,6 +21,8 @@ #include "config.h" #include "wine/port.h" +#include + #ifndef HAVE_USLEEP int usleep (unsigned int useconds) { diff --git a/libs/unicode/Makefile.in b/libs/unicode/Makefile.in index 4e1bc0455af..522cc6664bf 100644 --- a/libs/unicode/Makefile.in +++ b/libs/unicode/Makefile.in @@ -81,7 +81,7 @@ C_SRCS = \ wctype.c \ $(CODEPAGES:%=c_%.c) -all: $(MODULE) +all: $(MODULE) $(MODULE:.dll=.a) @MAKE_RULES@