diff options
| author | Bruno Haible <bruno@clisp.org> | 2010-03-08 01:23:38 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2010-03-08 03:11:12 +0100 |
| commit | 7ff877cb16fb5b2ba8a46dc681a213ddc760f084 (patch) | |
| tree | f01898bcf16892ebaec1ec4d0a4f91b05e8d2d9c /modules/stdlib | |
| parent | 0fe4d5f9d3673179644b3b823bf004396bfb8740 (diff) | |
| download | gnulib-7ff877cb16fb5b2ba8a46dc681a213ddc760f084.tar.gz | |
stdlib: Avoid #define replacements in C++ mode.
Diffstat (limited to 'modules/stdlib')
| -rw-r--r-- | modules/stdlib | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/stdlib b/modules/stdlib index 9323458811..6f9959f965 100644 --- a/modules/stdlib +++ b/modules/stdlib @@ -7,6 +7,7 @@ m4/stdlib_h.m4 Depends-on: arg-nonnull +c++defs include_next stddef stdint @@ -21,7 +22,7 @@ BUILT_SOURCES += stdlib.h # We need the following in order to create <stdlib.h> when the system # doesn't have one that works with the given compiler. -stdlib.h: stdlib.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H) +stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ @@ -77,6 +78,7 @@ stdlib.h: stdlib.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H) -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \ -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \ -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|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)/stdlib.in.h; \ |