From 1de68cb32ec6b702879793828653e85ec3bcc5e1 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 14 May 2012 19:38:06 -0500 Subject: Fix kstartperf failure This closes Bug 854 --- kstartperf/libkstartperf.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'kstartperf/libkstartperf.c') diff --git a/kstartperf/libkstartperf.c b/kstartperf/libkstartperf.c index 3c8deae0..9c6a0954 100644 --- a/kstartperf/libkstartperf.c +++ b/kstartperf/libkstartperf.c @@ -23,8 +23,7 @@ #include #include -#include - +#include /* Prototypes */ @@ -64,26 +63,28 @@ int XMapRaised(Display * d, Window w) void KDE_InterceptXMapRequest(Display * d, Window w) { - lt_dlhandle handle; + void * handle; + - handle = lt_dlopen("libX11.so"); + handle = dlopen("libX11.so", (RTLD_LAZY | RTLD_GLOBAL)); if (handle == 0L) - handle = lt_dlopen("libX11.so.6"); + handle = dlopen("libX11.so.6", (RTLD_LAZY | RTLD_GLOBAL)); if (handle == 0L) { - fprintf(stderr, "kstartperf: Could not dlopen libX11\n"); + const char * ltdlError = dlerror(); + fprintf(stderr, "kstartperf: Could not dlopen libX11: %s\n", ltdlError); exit(1); } - KDE_RealXMapWindow = (KDE_XMapRequestSignature)lt_dlsym(handle, "XMapWindow"); + KDE_RealXMapWindow = (KDE_XMapRequestSignature)dlsym(handle, "XMapWindow"); if (KDE_RealXMapWindow == 0L) { fprintf(stderr, "kstartperf: Could not find symbol XMapWindow in libX11\n"); exit(1); } - KDE_RealXMapRaised = (KDE_XMapRequestSignature)lt_dlsym(handle, "XMapRaised"); + KDE_RealXMapRaised = (KDE_XMapRequestSignature)dlsym(handle, "XMapRaised"); if (KDE_RealXMapRaised == 0L) { fprintf(stderr, "kstartperf: Could not find symbol XMapRaised in libX11\n"); -- cgit v1.2.1