diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-06-19 11:22:16 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-06-19 11:22:16 -0700 |
| commit | add3f049962534b7d8412517b69d53a3f411c5de (patch) | |
| tree | c77516b91dafd04c88101dc4d825fad5d1544b2c /lib | |
| parent | 9a028c23fb03e29337425bb351fe5786a19ccca6 (diff) | |
| download | emacs-add3f049962534b7d8412517b69d53a3f411c5de.tar.gz | |
* lib/unistd.in.h, m4/getloadavg.m4: Merge from gnulib.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/unistd.in.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/unistd.in.h b/lib/unistd.in.h index 261659bc167..fdf0fca54e9 100644 --- a/lib/unistd.in.h +++ b/lib/unistd.in.h @@ -1062,6 +1062,7 @@ _GL_WARN_ON_USE (pipe2, "pipe2 is unportable - " specification <http://www.opengroup.org/susv3xsh/pread.html>. */ # if @REPLACE_PREAD@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef pread # define pread rpl_pread # endif _GL_FUNCDECL_RPL (pread, ssize_t, @@ -1096,6 +1097,7 @@ _GL_WARN_ON_USE (pread, "pread is unportable - " <http://www.opengroup.org/susv3xsh/pwrite.html>. */ # if @REPLACE_PWRITE@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef pwrite # define pwrite rpl_pwrite # endif _GL_FUNCDECL_RPL (pwrite, ssize_t, |