diff options
| author | Bruno Haible <bruno@clisp.org> | 2019-12-11 10:46:16 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2019-12-11 11:38:53 +0100 |
| commit | 822412e5126f2d51f428997417085e5522a4a77d (patch) | |
| tree | f8698809e02176b4ffcac4536fb3d2628bdff18d | |
| parent | cc6745d8accfa37b8ed48a4ea4220ae80fb7f3bd (diff) | |
| download | gnulib-822412e5126f2d51f428997417085e5522a4a77d.tar.gz gnulib-822412e5126f2d51f428997417085e5522a4a77d.tar.bz2 | |
unistd: Fix compilation error in C++ mode on MSVC.
* lib/unistd.in.h: Don't do include[_next] <unistd.h> if the platform
does not have <unistd.h>.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/unistd.in.h | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,5 +1,11 @@ 2019-12-11 Bruno Haible <bruno@clisp.org> + unistd: Fix compilation error in C++ mode on MSVC. + * lib/unistd.in.h: Don't do include[_next] <unistd.h> if the platform + does not have <unistd.h>. + +2019-12-11 Bruno Haible <bruno@clisp.org> + locale: Fix compilation error in C++ mode on MSVC. * m4/locale_h.m4 (gl_LOCALE_H): Don't set REPLACE_STRUCT_LCONV on MSVC. * lib/locale.in.h (int_p_cs_precedes, int_p_sign_posn, diff --git a/lib/unistd.in.h b/lib/unistd.in.h index 28ab704c3b..269318eb73 100644 --- a/lib/unistd.in.h +++ b/lib/unistd.in.h @@ -21,7 +21,7 @@ #endif @PRAGMA_COLUMNS@ -#ifdef _GL_INCLUDING_UNISTD_H +#if @HAVE_UNISTD_H@ && defined _GL_INCLUDING_UNISTD_H /* Special invocation convention: - On Mac OS X 10.3.9 we have a sequence of nested includes <unistd.h> -> <signal.h> -> <pthread.h> -> <unistd.h> |