From aa007a7b633bb6381c6d0967044da1aaea8c1b24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@kde.org>
Date: Mon, 6 Jan 2003 12:19:14 +0000
Subject: [PATCH] Enable --enable-final again, and also get rid of that ugly
 select() hack that apparently came from Qt - we don't support every stupid
 Nullix-0.1 out there.

svn path=/trunk/kdebase/kwin/; revision=197769
---
 Makefile.am   |  4 +---
 workspace.cpp | 16 ++++++----------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 15423bcd41..9f370288b8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ bin_PROGRAMS = kwin
 lib_LTLIBRARIES = kwin.la
 
 # workspace.cpp has to be first in order not to break --enable-final
-kwin_la_SOURCES = workspace.cpp placement.cpp atoms.cpp  client.cpp main.cpp \
+kwin_la_SOURCES = client.cpp workspace.cpp placement.cpp atoms.cpp  main.cpp \
 	popupinfo.cpp tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \
 	killwindow.cpp kwinbutton.cpp
 kwin_la_LIBADD = $(LIB_KDEUI)
@@ -23,8 +23,6 @@ kwin_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 
 KDE_ICON = kwin
 
-KDE_OPTIONS = nofinal
-
 METASOURCES = AUTO
 
 messages:
diff --git a/workspace.cpp b/workspace.cpp
index a7b5e741f4..168b493e22 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -5,7 +5,6 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 ******************************************************************/
 
 //#define QT_CLEAN_NAMESPACE
-#define select kwin_hide_select
 
 #include <config.h>
 #include <kconfig.h>
@@ -45,6 +44,12 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 #include <X11/extensions/shape.h>
 #include <X11/cursorfont.h>
 #include <sys/time.h>
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+#include <sys/time.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 const int XIconicState = IconicState;
 #undef IconicState
@@ -54,15 +59,6 @@ const int XAbove = Above;
 #include <kwin.h>
 #include <kdebug.h>
 
-// Possible protoypes for select() were hidden as `kwin_hide_select.
-// Undo the hiding definition and defines an acceptable prototype.
-// This is how Qt does this. It should work where Qt works.
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-#undef select
-extern "C" int select(int,void*,void*,void*,struct timeval*);
-
 namespace KWinInternal {
 
 // NET WM Protocol handler class