summaryrefslogtreecommitdiff
path: root/modules/sys_time
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2011-09-14 02:08:36 +0200
committerBruno Haible <bruno@clisp.org>2011-09-14 02:08:36 +0200
commit022647638a69cf8657ccd41eda5dadc2c51c8705 (patch)
treef5bf5687dd9cc2b3cafa395dd68a1170e755065a /modules/sys_time
parentd21e88b5e6e9c8c1065fbe1d3a641ccd531acc1c (diff)
downloadgnulib-022647638a69cf8657ccd41eda5dadc2c51c8705.tar.gz
sys_time: Support for MSVC.
* m4/sys_time_h.m4 (gl_HEADER_SYS_TIME_H_BODY): Invoke gl_PREREQ_SYS_H_WINSOCK2. When testing for 'struct timeval', also include <winsock2.h>. * lib/sys_time.in.h: On MSVC, include <winsock2.h> and hide its function declarations that collide with POSIX. * modules/sys_time (Files): Add m4/sys_socket_h.m4. (Makefile.am): Substitute HAVE_WINSOCK2_H.
Diffstat (limited to 'modules/sys_time')
-rw-r--r--modules/sys_time2
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/sys_time b/modules/sys_time
index 18700e8300..cdf0d46674 100644
--- a/modules/sys_time
+++ b/modules/sys_time
@@ -4,6 +4,7 @@ A <sys/time.h> that conforms better to POSIX.
Files:
lib/sys_time.in.h
m4/sys_time_h.m4
+m4/sys_socket_h.m4
Depends-on:
include_next
@@ -31,6 +32,7 @@ sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \
-e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \
+ -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \
-e 's/@''HAVE_GETTIMEOFDAY''@/$(HAVE_GETTIMEOFDAY)/g' \
-e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \
-e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \