diff options
| author | Bruno Haible <bruno@clisp.org> | 2010-03-08 01:48:56 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2010-03-08 03:11:15 +0100 |
| commit | f4ad91ad4e24493e8bb1ef8afe81fe3955329f7d (patch) | |
| tree | 47c6e5f3bf9650428e718cbab6316430d31d4a71 /modules/wchar | |
| parent | d2a61622a071d04bc00883613a41f70798f7ef68 (diff) | |
| download | gnulib-f4ad91ad4e24493e8bb1ef8afe81fe3955329f7d.tar.gz | |
wchar: Avoid #define replacements in C++ mode.
Diffstat (limited to 'modules/wchar')
| -rw-r--r-- | modules/wchar | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/wchar b/modules/wchar index c9d1291a56..da1c2b35eb 100644 --- a/modules/wchar +++ b/modules/wchar @@ -8,6 +8,7 @@ m4/wint_t.m4 Depends-on: arg-nonnull +c++defs include_next stddef warn-on-use @@ -20,7 +21,7 @@ BUILT_SOURCES += wchar.h # We need the following in order to create <wchar.h> when the system # version does not work standalone. -wchar.h: wchar.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H) +wchar.h: wchar.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' \ @@ -62,6 +63,7 @@ wchar.h: wchar.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H) -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \ -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \ -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|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)/wchar.in.h; \ |