yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enable --enable-final again, and also get rid of that ugly select() hack

Browse source 
that apparently came from Qt - we don't support every stupid Nullix-0.1
out there.

svn path=/trunk/kdebase/kwin/; revision=197769
This commit is contained in:
Luboš Luňák 2003-01-06 12:19:14 +00:00
parent ed2c5e8954
commit aa007a7b63
2 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile.am
View file

@ -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:

16
workspace.cpp
View file

@ -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