[kwin] Add used features from config-workspace.h to config-kwin.h

Adds HAVE_UNISTD_H and HAVE_MALLOC_H to config-kwin.h and gets used
in main.cpp. With that KWin does no longer need config-workspace.h.
This commit is contained in:
Martin Gräßlin 2014-03-18 09:30:40 +01:00
parent ca5f8cfe03
commit cb262a2bbb
3 changed files with 10 additions and 1 deletions

View file

@ -66,6 +66,9 @@ if(${HAVE_WAYLAND})
else()
set(HAVE_XKB FALSE)
endif()
check_include_files(unistd.h HAVE_UNISTD_H)
check_include_files(malloc.h HAVE_MALLOC_H)
configure_file(config-kwin.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kwin.h )

View file

@ -11,3 +11,9 @@
#cmakedefine01 HAVE_WAYLAND
#cmakedefine01 HAVE_WAYLAND_EGL
#cmakedefine01 HAVE_XKB
/* Define to 1 if you have the <unistd.h> header file. */
#cmakedefine HAVE_UNISTD_H 1
/* Define to 1 if you have the <malloc.h> header file. */
#cmakedefine HAVE_MALLOC_H 1

View file

@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
#include "main.h"
#include "config-workspace.h"
#include <config-kwin.h>
// kwin
#include "atoms.h"
#include "options.h"