diff options
| author | Bruno Haible <bruno@clisp.org> | 2010-03-08 01:41:33 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2010-03-08 03:11:14 +0100 |
| commit | e650136cc4a199e64a3b3401cf7e2195b0f3a3ac (patch) | |
| tree | baae2de9b58e5eef681996abb6b0d48022e5ee90 /modules/sys_time | |
| parent | f25e4400791ad31ed833cc4b784bde21ca4414e4 (diff) | |
| download | gnulib-e650136cc4a199e64a3b3401cf7e2195b0f3a3ac.tar.gz | |
sys_time: Avoid #define replacements in C++ mode.
Diffstat (limited to 'modules/sys_time')
| -rw-r--r-- | modules/sys_time | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/sys_time b/modules/sys_time index adfa49386a..4df85d7e48 100644 --- a/modules/sys_time +++ b/modules/sys_time @@ -8,6 +8,7 @@ m4/sys_time_h.m4 Depends-on: include_next arg-nonnull +c++defs warn-on-use configure.ac: @@ -19,7 +20,7 @@ BUILT_SOURCES += sys/time.h # We need the following in order to create <sys/time.h> when the system # doesn't have one that works with the given compiler. -sys/time.h: sys_time.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H) +sys/time.h: sys_time.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) $(AM_V_at)$(MKDIR_P) sys $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ @@ -31,6 +32,7 @@ sys/time.h: sys_time.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H) -e 's/@''HAVE_GETTIMEOFDAY''@/$(HAVE_GETTIMEOFDAY)/g' \ -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \ -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ < $(srcdir)/sys_time.in.h; \ |