diff --git a/src/pty.c b/src/pty.c index 9b03612227..151a2780f7 100644 --- a/src/pty.c +++ b/src/pty.c @@ -267,10 +267,11 @@ OpenPTY(char **ttyn) } #endif -#if defined(HAVE_SVR4_PTYS) && !defined(PTY_DONE) && !defined(hpux) && !defined(MACOS_X) +#if defined(HAVE_SVR4_PTYS) && !defined(PTY_DONE) && !defined(hpux) \ + && !(defined(MACOS_X) && !defined(MAC_OS_X_VERSION_10_6)) /* NOTE: Even though HPUX can have /dev/ptmx, the code below doesn't work! - * Same for Mac OS X Leopard. */ + * Same for Mac OS X Leopard (10.5). */ #define PTY_DONE int OpenPTY(char **ttyn) diff --git a/src/version.c b/src/version.c index b28cd91a6d..f02ebe0e5d 100644 --- a/src/version.c +++ b/src/version.c @@ -761,6 +761,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1166, /**/ 1165, /**/