diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-12 17:56:39 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-12 17:56:39 -0500 |
| commit | e2c5ea4cdad7dbb560be87a7d3c894e980b5ab6f (patch) | |
| tree | b2717634a496f982c82b13c6aa67252caad85268 /kdesktop | |
| parent | 1346f6898707e6a4d95abee07c3d1608fc056998 (diff) | |
| parent | 68cfc4fec0fed7ef4da9f03da68bd61900654ee3 (diff) | |
| download | tdebase-e2c5ea4cdad7dbb560be87a7d3c894e980b5ab6f.tar.gz tdebase-e2c5ea4cdad7dbb560be87a7d3c894e980b5ab6f.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'kdesktop')
| -rw-r--r-- | kdesktop/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kdesktop/lock/lockprocess.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt index 80ea9c21a..743a3453e 100644 --- a/kdesktop/CMakeLists.txt +++ b/kdesktop/CMakeLists.txt @@ -97,7 +97,7 @@ tde_add_tdeinit_executable( ${target} AUTOMOC LINK kdesktopsettings-static bgnd-static dmctl-static konq-shared tdeutils-shared - ${XRENDER_LIBRARIES} ${XCURSOR_LIBRARIES} Xext dl + ${XRENDER_LIBRARIES} ${XCURSOR_LIBRARIES} Xext ${DL_LIBRARIES} ${XSS_LIBRARIES} ${DBUS_1_TQT_LIBRARIES} ) diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index 773a0710a..1de0b6753 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -79,7 +79,9 @@ #include <kcrash.h> +#ifdef __linux__ #include <linux/stat.h> +#endif #include <X11/Xlib.h> #include <X11/Xutil.h> |