# HG changeset patch # User Jacob Dawid # Date 1338647629 -7200 # Node ID d79d1a3130c8fefc0f38de672cf4844804fd4681 # Parent a8ff19a82906f49a7c5f81f8850763663d07a55a Fix for building on MacOS. diff -r a8ff19a82906 -r d79d1a3130c8 libqterminal/unix/kpty.cpp --- a/libqterminal/unix/kpty.cpp Mon May 28 02:14:59 2012 +0200 +++ b/libqterminal/unix/kpty.cpp Sat Jun 02 16:33:49 2012 +0200 @@ -61,14 +61,17 @@ #include #include -#if defined(HAVE_PTY_H) -# include -#endif - -#ifdef HAVE_LIBUTIL_H -# include -#elif defined(HAVE_UTIL_H) +#ifdef Q_OS_MAC # include +#else +# if defined(HAVE_PTY_H) +# include +# endif +# ifdef HAVE_LIBUTIL_H +# include +# elif defined(HAVE_UTIL_H) +# include +# endif #endif /* @@ -305,16 +308,16 @@ p = getgrnam("wheel"); gid_t gid = p ? p->gr_gid : getgid (); - if (!chown(d->ttyName.data(), getuid(), gid)) { - chmod(d->ttyName.data(), S_IRUSR|S_IWUSR|S_IWGRP); - } + if (!chown(d->ttyName.data(), getuid(), gid)) { + chmod(d->ttyName.data(), S_IRUSR|S_IWUSR|S_IWGRP); + } } goto gotpty; } ::close(d->masterFd); d->masterFd = -1; - } - } + } + } } qWarning() << "Can't open a pseudo teletype";