diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-08-29 22:17:49 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-09-22 01:58:24 -0700 |
| commit | 6238e1ae8d96191ee8a580a60ff5287f22f6f04d (patch) | |
| tree | 13a25cfa0e179e9168371ff23ef34ebb675d5fda /lib/pipe-filter-aux.h | |
| parent | 3384ca93a6b2ceaf9529ff25e162a184a6bc8967 (diff) | |
| download | gnulib-6238e1ae8d96191ee8a580a60ff5287f22f6f04d.tar.gz | |
pipe-filter-gi, pipe-filter-ii: better use of 'inline'
* lib/pipe-filter-aux.c: New file.
* lib/pipe-filter-aux.h (PIPE_FILTER_AUX_INLINE): New macro.
Replace all uses of 'static inline' with it.
Use _GL_INLINE_HEADER_BEGIN, _GL_INLINE_HEADER_END.
* lib/pipe-filter-gi.c (filter_init, filter_cleanup)
(filter_retcode): No real need for inline here.
* modules/pipe-filter-gi, modules/pipe-filter-ii:
(Files): Add lib/pipe-filter-aux.c.
(Depends-on): Add extern-inline.
(configure.ac): Do not require AC_C_INLINE.
(lib_SOURCES): Add pipe-filter-aux.c.
Diffstat (limited to 'lib/pipe-filter-aux.h')
| -rw-r--r-- | lib/pipe-filter-aux.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/pipe-filter-aux.h b/lib/pipe-filter-aux.h index 38fa164ba6..713c1a0088 100644 --- a/lib/pipe-filter-aux.h +++ b/lib/pipe-filter-aux.h @@ -15,6 +15,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ +_GL_INLINE_HEADER_BEGIN +#ifndef PIPE_FILTER_AUX_INLINE +# define PIPE_FILTER_AUX_INLINE _GL_INLINE +#endif #ifndef SSIZE_MAX # define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2)) @@ -39,7 +43,7 @@ These functions can return -1/EINTR even though we don't have any signal handlers set up, namely when we get interrupted via SIGSTOP. */ -static inline int +PIPE_FILTER_AUX_INLINE int nonintr_close (int fd) { int retval; @@ -53,7 +57,7 @@ nonintr_close (int fd) #undef close /* avoid warning related to gnulib module unistd */ #define close nonintr_close -static inline ssize_t +PIPE_FILTER_AUX_INLINE ssize_t nonintr_read (int fd, void *buf, size_t count) { ssize_t retval; @@ -66,7 +70,7 @@ nonintr_read (int fd, void *buf, size_t count) } #define read nonintr_read -static inline ssize_t +PIPE_FILTER_AUX_INLINE ssize_t nonintr_write (int fd, const void *buf, size_t count) { ssize_t retval; @@ -82,7 +86,7 @@ nonintr_write (int fd, const void *buf, size_t count) # if HAVE_SELECT -static inline int +PIPE_FILTER_AUX_INLINE int nonintr_select (int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout) { @@ -111,3 +115,5 @@ nonintr_select (int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, # define IS_EAGAIN(errcode) ((errcode) == EAGAIN) # endif #endif + +_GL_INLINE_HEADER_END |