diff options
| -rw-r--r-- | kdecore/kpty.cpp | 13 | ||||
| -rw-r--r-- | kdeprint/cups/cupsdconf2/cupsddialog.cpp | 2 | ||||
| -rw-r--r-- | kdeprint/cups/kmcupsmanager.cpp | 8 | ||||
| -rw-r--r-- | kdeui/ksconfig.cpp | 2 |
4 files changed, 14 insertions, 11 deletions
diff --git a/kdecore/kpty.cpp b/kdecore/kpty.cpp index 4b17b20f7..c0c7c9756 100644 --- a/kdecore/kpty.cpp +++ b/kdecore/kpty.cpp @@ -68,10 +68,13 @@ #include <unistd.h> #include <grp.h> -#if defined(HAVE_LIBUTIL_H) && (!defined(__FreeBSD__) || __FreeBSD_version < 900007) +#if defined(HAVE_LIBUTIL_H) # include <libutil.h> -# define USE_LOGIN -#elif defined(HAVE_UTIL_H) +# if (!defined(__FreeBSD__) || __FreeBSD_version < 900007) +# define USE_LOGIN +# endif +#endif +#if defined(HAVE_UTIL_H) # include <util.h> # define USE_LOGIN #endif @@ -305,7 +308,7 @@ bool KPty::open() if (d->masterFd >= 0) return true; -#if defined(__OpenBSD__) +#if defined(__OpenBSD__) || defined(__FreeBSD__) char cpty[16]; if (openpty(&d->masterFd, &d->slaveFd, cpty, NULL, &d->winSize) == 0) { @@ -580,7 +583,7 @@ int KPty::slaveFd() const // private bool KPty::chownpty(bool grant) { -#if !defined(__OpenBSD__) +#if !defined(__OpenBSD__) && !defined(__FreeBSD__) KProcess proc; proc << locate("exe", BASE_CHOWN) << (grant?"--grant":"--revoke") << TQString::number(d->masterFd); return proc.start(KProcess::Block) && proc.normalExit() && !proc.exitStatus(); diff --git a/kdeprint/cups/cupsdconf2/cupsddialog.cpp b/kdeprint/cups/cupsdconf2/cupsddialog.cpp index 9863a6146..de1f07027 100644 --- a/kdeprint/cups/cupsdconf2/cupsddialog.cpp +++ b/kdeprint/cups/cupsdconf2/cupsddialog.cpp @@ -71,7 +71,7 @@ extern "C" int getServerPid() { -#if defined(__OpenBSD__) +#if defined(__OpenBSD__) || defined(__FreeBSD__) TQProcess *proc = new TQProcess(); proc->addArgument("pgrep"); proc->addArgument("cupsd"); diff --git a/kdeprint/cups/kmcupsmanager.cpp b/kdeprint/cups/kmcupsmanager.cpp index b1c776004..02dfeb77e 100644 --- a/kdeprint/cups/kmcupsmanager.cpp +++ b/kdeprint/cups/kmcupsmanager.cpp @@ -102,7 +102,7 @@ TQString KMCupsManager::driverDirectory() { TQString d = cupsInstallDir(); if (d.isEmpty()) { -#ifdef __OpenBSD__ +#if defined(__OpenBSD__) || defined(__FreeBSD__) d = "/usr/local"; #else d = "/usr"; @@ -110,7 +110,7 @@ TQString KMCupsManager::driverDirectory() } d.append("/share/cups/model"); // raw foomatic support -#ifdef __OpenBSD__ +#if defined(__OpenBSD__) || defined(__FreeBSD__) d.append(":/usr/local/share/foomatic/db/source"); #else d.append(":/usr/share/foomatic/db/source"); @@ -640,7 +640,7 @@ DrMain* KMCupsManager::loadMaticDriver(const TQString& drname) { TQStringList comps = TQStringList::split('/', drname, false); TQString tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8)); -#ifdef __OpenBSD__ +#if defined(__OpenBSD__) || defined(__FreeBSD__) TQString PATH = getenv("PATH") + TQString::fromLatin1(":/usr/local/bin:/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); #else TQString PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); @@ -959,7 +959,7 @@ void KMCupsManager::exportDriver() { TQString path = cupsInstallDir(); if (path.isEmpty()) { -#ifdef __OpenBSD__ +#if defined(__OpenBSD__) || defined(__FreeBSD__) path = "/usr/local/share/cups"; #else path = "/usr/share/cups"; diff --git a/kdeui/ksconfig.cpp b/kdeui/ksconfig.cpp index 8774fc27e..c82f71ef7 100644 --- a/kdeui/ksconfig.cpp +++ b/kdeui/ksconfig.cpp @@ -188,7 +188,7 @@ KSpellConfig::readGlobalSettings() setDictionary ( kc->readEntry("KSpell_Dictionary") ); setDictFromList ( kc->readNumEntry("KSpell_DictFromList", false) ); setEncoding ( kc->readNumEntry ("KSpell_Encoding", KS_E_UTF8) ); -#ifdef __OpenBSD__ +#if defined(__OpenBSD__) || defined(__FreeBSD__) setClient ( kc->readNumEntry ("KSpell_Client", KS_CLIENT_ASPELL) ); #else setClient ( kc->readNumEntry ("KSpell_Client", KS_CLIENT_ISPELL) ); |