diff options
| author | Simon Josefsson <simon@josefsson.org> | 2009-08-20 15:37:05 +0200 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2009-08-20 15:37:05 +0200 |
| commit | 091b9d4e120e9f98b7ba01011f7dafcffc298f7b (patch) | |
| tree | cc80b510a892afdc0c2d85444bd5eaac96e7f9b9 /lib/gl | |
| parent | d56d25e4b2425a7a17eb8d5bd3b896198a8abc99 (diff) | |
| download | gnutls-091b9d4e120e9f98b7ba01011f7dafcffc298f7b.tar.gz | |
Update gnulib files.
Diffstat (limited to 'lib/gl')
| -rw-r--r-- | lib/gl/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/gl/m4/stdio_h.m4 | 4 | ||||
| -rw-r--r-- | lib/gl/stdio.in.h | 14 |
3 files changed, 19 insertions, 1 deletions
diff --git a/lib/gl/Makefile.am b/lib/gl/Makefile.am index a0e3cd44c3..c6654ab6fa 100644 --- a/lib/gl/Makefile.am +++ b/lib/gl/Makefile.am @@ -426,6 +426,7 @@ stdio.h: stdio.in.h -e 's|@''GNULIB_FPUTS''@|$(GNULIB_FPUTS)|g' \ -e 's|@''GNULIB_PUTS''@|$(GNULIB_PUTS)|g' \ -e 's|@''GNULIB_FWRITE''@|$(GNULIB_FWRITE)|g' \ + -e 's|@''GNULIB_POPEN''@|$(GNULIB_POPEN)|g' \ -e 's|@''GNULIB_GETDELIM''@|$(GNULIB_GETDELIM)|g' \ -e 's|@''GNULIB_GETLINE''@|$(GNULIB_GETLINE)|g' \ -e 's|@''GNULIB_PERROR''@|$(GNULIB_PERROR)|g' \ @@ -459,6 +460,7 @@ stdio.h: stdio.in.h -e 's|@''REPLACE_FPURGE''@|$(REPLACE_FPURGE)|g' \ -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \ -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \ + -e 's|@''REPLACE_POPEN''@|$(REPLACE_POPEN)|g' \ -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \ -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \ -e 's|@''REPLACE_GETLINE''@|$(REPLACE_GETLINE)|g' \ diff --git a/lib/gl/m4/stdio_h.m4 b/lib/gl/m4/stdio_h.m4 index fcbe68f6ba..8c9aa8f5b5 100644 --- a/lib/gl/m4/stdio_h.m4 +++ b/lib/gl/m4/stdio_h.m4 @@ -1,4 +1,4 @@ -# stdio_h.m4 serial 16 +# stdio_h.m4 serial 17 dnl Copyright (C) 2007-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -73,6 +73,7 @@ AC_DEFUN([gl_STDIO_H_DEFAULTS], GNULIB_FPUTS=0; AC_SUBST([GNULIB_FPUTS]) GNULIB_PUTS=0; AC_SUBST([GNULIB_PUTS]) GNULIB_FWRITE=0; AC_SUBST([GNULIB_FWRITE]) + GNULIB_POPEN=0; AC_SUBST([GNULIB_POPEN]) GNULIB_GETDELIM=0; AC_SUBST([GNULIB_GETDELIM]) GNULIB_GETLINE=0; AC_SUBST([GNULIB_GETLINE]) GNULIB_PERROR=0; AC_SUBST([GNULIB_PERROR]) @@ -109,6 +110,7 @@ AC_DEFUN([gl_STDIO_H_DEFAULTS], REPLACE_FPURGE=0; AC_SUBST([REPLACE_FPURGE]) HAVE_DECL_FPURGE=1; AC_SUBST([HAVE_DECL_FPURGE]) REPLACE_FCLOSE=0; AC_SUBST([REPLACE_FCLOSE]) + REPLACE_POPEN=0; AC_SUBST([REPLACE_POPEN]) HAVE_DECL_GETDELIM=1; AC_SUBST([HAVE_DECL_GETDELIM]) HAVE_DECL_GETLINE=1; AC_SUBST([HAVE_DECL_GETLINE]) REPLACE_GETLINE=0; AC_SUBST([REPLACE_GETLINE]) diff --git a/lib/gl/stdio.in.h b/lib/gl/stdio.in.h index e04799bc9d..887b0ae52b 100644 --- a/lib/gl/stdio.in.h +++ b/lib/gl/stdio.in.h @@ -479,6 +479,20 @@ extern int puts (const char *string); extern size_t fwrite (const void *ptr, size_t s, size_t n, FILE *stream); #endif +#if @GNULIB_POPEN@ +# if @REPLACE_POPEN@ +# undef popen +# define popen rpl_popen +extern FILE *popen (const char *cmd, const char *mode); +# endif +#elif defined GNULIB_POSIXCHECK +# undef popen +# define popen(c,m) \ + (GL_LINK_WARNING ("popen is buggy on some platforms - " \ + "use gnulib module popen or pipe for more portability"), \ + popen (c, m)) +#endif + #if @GNULIB_GETDELIM@ # if !@HAVE_DECL_GETDELIM@ /* Read input, up to (and including) the next occurrence of DELIMITER, from |