From fe37cc7e7b3036e538930c16bbdb39a7915b1685 Mon Sep 17 00:00:00 2001 From: Matthieu Herrb Date: Fri, 1 Apr 2005 21:28:50 +0000 Subject: [PATCH] programs/Xserver/hw/xfree86/loader/xf86sym.c programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c Fix setjump0 declaration for DllLoader. --- hw/xfree86/loader/xf86sym.c | 2 +- hw/xfree86/os-support/shared/libc_wrapper.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c index f18e04468..ec0436125 100644 --- a/hw/xfree86/loader/xf86sym.c +++ b/hw/xfree86/loader/xf86sym.c @@ -928,7 +928,7 @@ LOOKUP xfree86LookupTab[] = { #endif #else SYMFUNCALIAS("xf86setjmp", setjmp) - SYMFUNCALIAS("xf86setjmp0", setjmp) + SYMFUNC(xf86setjmp0) SYMFUNC(xf86setjmp1) #endif SYMFUNCALIAS("xf86longjmp", longjmp) diff --git a/hw/xfree86/os-support/shared/libc_wrapper.c b/hw/xfree86/os-support/shared/libc_wrapper.c index d02292231..cd92886ff 100644 --- a/hw/xfree86/os-support/shared/libc_wrapper.c +++ b/hw/xfree86/os-support/shared/libc_wrapper.c @@ -2123,6 +2123,12 @@ xf86setjmp1(xf86jmp_buf env, int arg2) FatalError("setjmp: type 1 called instead of type %d", xf86getjmptype()); } +int +xf86setjmp0(xf86jmp_buf env) +{ + return setjmp((void *)env); +} + #endif /* HAS_GLIBC_SIGSETJMP */ int