diff options
| author | Bruno Haible <bruno@clisp.org> | 2010-03-08 01:26:36 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2010-03-08 03:11:12 +0100 |
| commit | e377b2bd0fa750be14180f07d4c23f843fce9cc0 (patch) | |
| tree | f15ba60db12522cc6b4bb307e2c9455f2b2bce0f /modules/string | |
| parent | 7ff877cb16fb5b2ba8a46dc681a213ddc760f084 (diff) | |
| download | gnulib-e377b2bd0fa750be14180f07d4c23f843fce9cc0.tar.gz | |
string: Avoid #define replacements in C++ mode.
Diffstat (limited to 'modules/string')
| -rw-r--r-- | modules/string | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/string b/modules/string index e4cf6b6b55..2ec71f5561 100644 --- a/modules/string +++ b/modules/string @@ -7,6 +7,7 @@ m4/string_h.m4 Depends-on: arg-nonnull +c++defs extensions include_next stddef @@ -20,7 +21,7 @@ BUILT_SOURCES += string.h # We need the following in order to create <string.h> when the system # doesn't have one that works with the given compiler. -string.h: string.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H) +string.h: string.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' \ @@ -88,6 +89,7 @@ string.h: string.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H) -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \ -e 's|@''REPLACE_STRTOK_R''@|$(REPLACE_STRTOK_R)|g' \ -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|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)/string.in.h; \ |