| From 6954995dd32ea98a1973df31f411f3996bb47dfb Mon Sep 17 00:00:00 2001 |
| From: Tom Tromey <tom@tromey.com> |
| Date: Mon, 1 Oct 2018 14:57:45 -0600 |
| Subject: [PATCH] mkostemp, mkostemps: Fix compilation error in C++ mode on Mac |
| OS X. |
| |
| Attempting to use the mkostemp module in gdb caused a build failure |
| when using the C++ namespace feature, because mkostemp was not |
| declared. On OS X, mkostemp is declared in unistd.h, so this patch |
| extends the existing special case in stdlib.in.h to cover mkostemp and |
| mkostemps. |
| |
| * lib/stdlib.in.h: Include <unistd.h> for mkostemp and mkostemps |
| on OS X. |
| --- |
| ChangeLog | 6 ++++++ |
| lib/stdlib.in.h | 3 ++- |
| 2 files changed, 8 insertions(+), 1 deletion(-) |
| |
| diff --git a/gdb/gnulib/import/stdlib.in.h b/gdb/gnulib/import/stdlib.in.h |
| index db3253bd97..8f803a2ea3 100644 |
| --- a/gdb/gnulib/import/stdlib.in.h |
| +++ b/gdb/gnulib/import/stdlib.in.h |
| @@ -87,9 +87,10 @@ struct random_data |
| # endif |
| #endif |
| |
| -#if (@GNULIB_MKSTEMP@ || @GNULIB_MKSTEMPS@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) |
| +#if (@GNULIB_MKSTEMP@ || @GNULIB_MKSTEMPS@ || @GNULIB_MKOSTEMP@ || @GNULIB_MKOSTEMPS@ || @GNULIB_GETSUBOPT@ || defined GNULIB_POSIXCHECK) && ! defined __GLIBC__ && !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) |
| /* On Mac OS X 10.3, only <unistd.h> declares mkstemp. */ |
| /* On Mac OS X 10.5, only <unistd.h> declares mkstemps. */ |
| +/* On Mac OS X 10.13, only <unistd.h> declares mkostemp and mkostemps. */ |
| /* On Cygwin 1.7.1, only <unistd.h> declares getsubopt. */ |
| /* But avoid namespace pollution on glibc systems and native Windows. */ |
| # include <unistd.h> |
| -- |
| 2.19.0 |
| |
