diff options
| author | Bruno Haible <bruno@clisp.org> | 2010-03-08 01:33:25 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2010-03-08 03:11:13 +0100 |
| commit | a1133754bf7a631401ad32244041088fb639b819 (patch) | |
| tree | 5b7f1a782ba57c95032dcb2c2379da28a15f0f92 /modules/sys_select | |
| parent | a1b4e274c19df1fcb7540aaa82c65154a85ce880 (diff) | |
| download | gnulib-a1133754bf7a631401ad32244041088fb639b819.tar.gz | |
sys_select: Avoid #define replacements in C++ mode.
Diffstat (limited to 'modules/sys_select')
| -rw-r--r-- | modules/sys_select | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/sys_select b/modules/sys_select index 27d9a48cb4..4f4d6d9bb3 100644 --- a/modules/sys_select +++ b/modules/sys_select @@ -7,6 +7,7 @@ m4/sys_select_h.m4 Depends-on: include_next +c++defs sys_socket sys_time warn-on-use @@ -20,7 +21,7 @@ BUILT_SOURCES += sys/select.h # We need the following in order to create <sys/select.h> when the system # doesn't have one that works with the given compiler. -sys/select.h: sys_select.in.h $(WARN_ON_USE_H) +sys/select.h: sys_select.in.h $(CXXDEFS_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/select.h: sys_select.in.h $(WARN_ON_USE_H) -e 's|@''GNULIB_SELECT''@|$(GNULIB_SELECT)|g' \ -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ -e 's|@''REPLACE_SELECT''@|$(REPLACE_SELECT)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ < $(srcdir)/sys_select.in.h; \ } > $@-t && \ |