vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

WABA: Use kdemain() instead of main() so that closures don't complain about 

main being defined twice with different symbol sizes.

svn path=/trunk/kdebase/kwin/; revision=63094
icc-effect-5.14.5
Waldo Bastian 2000-09-07 22:46:24 +00:00
parent 8660053273
commit ebe199a301
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -32,5 +32,5 @@ sounddir= $(kde_sounddir)
sound_DATA = pop.wav sound_DATA = pop.wav
dummy.cpp: dummy.cpp:
echo > dummy.cpp echo 'extern "C" { int kdemain(int, char *[]);} int main(int c, char *v[]) { return kdemain(c,v); }' > dummy.cpp

2
client.cpp
View File

@ -2573,7 +2573,7 @@ NoBorderClient::~NoBorderClient()
{ {
} }
QPixmap * kwin_get_menu_pix_hack() static QPixmap * kwin_get_menu_pix_hack()
{ {
static QPixmap p; static QPixmap p;
if ( p.isNull() ) if ( p.isNull() )

4
main.cpp
View File

@ -192,7 +192,9 @@ static void sighandler(int) {
static const char *version = "0.5"; static const char *version = "0.5";
static const char *description = I18N_NOOP( "The KDE window manager." ); static const char *description = I18N_NOOP( "The KDE window manager." );
int main( int argc, char * argv[] ) extern "C" { int kdemain(int, char *[]); }
int kdemain( int argc, char * argv[] )
{ {
KAboutData aboutData( "kwin", I18N_NOOP("KWin"), KAboutData aboutData( "kwin", I18N_NOOP("KWin"),
version, description, KAboutData::License_BSD, version, description, KAboutData::License_BSD,