diff options
| author | Timothy Pearson <[email protected]> | 2014-10-18 18:35:56 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2014-10-18 18:35:56 -0500 |
| commit | 891da4b83e901780ca4becb9b6f7c9cf0fb70ffd (patch) | |
| tree | b177b8ddddf3a0e73a86e482d88e0e188c601516 /ksmserver/shutdowndlg.cpp | |
| parent | 0c11ace605ba33feb137eca638a39c27a71e1d8d (diff) | |
| parent | d7ccc16037550f5dc9ba2db00e47ea950c3732d2 (diff) | |
| download | tdebase-891da4b83e901780ca4becb9b6f7c9cf0fb70ffd.tar.gz tdebase-891da4b83e901780ca4becb9b6f7c9cf0fb70ffd.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'ksmserver/shutdowndlg.cpp')
| -rw-r--r-- | ksmserver/shutdowndlg.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp index 6b3b02428..d4881ad85 100644 --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/shutdowndlg.cpp @@ -33,7 +33,9 @@ Copyright (C) 2000 Matthias Ettrich <[email protected]> #include <tdelocale.h> #include <tdeconfig.h> #include <tdeapplication.h> +#ifdef __TDE_HAVE_TDEHWLIB #include <tdehardwaredevices.h> +#endif #include <kdebug.h> #include <kpushbutton.h> #include <kstdguiitem.h> @@ -805,7 +807,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, bool canSuspend = false; bool canHibernate = false; -#ifdef COMPILE_HALBACKEND +#if defined(COMPILE_HALBACKEND) // Query HAL for suspend/resume support m_halCtx = libhal_ctx_new(); @@ -860,7 +862,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, canHibernate = true; } } -#else // COMPILE_HALBACKEND +#elif defined(__TDE_HAVE_TDEHWLIB) // COMPILE_HALBACKEND TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice(); if (rootDevice) { canFreeze = rootDevice->canFreeze(); |