empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up the incomprehensible #ifdef jungle a bit. Didn't compile if

Browse source 
both UCONTEXT and one of the other recognized preprocessor symbols was
defined; fix to prefer UCONTEXT.
This commit is contained in:
Markus Armbruster 2005-12-05 20:30:29 +00:00
parent 5d79a0cf6e
commit 081e60d86e
2 changed files with 38 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/lib/lwp/arch.c
View file

@ -36,13 +36,27 @@
#if defined(_EMPTH_LWP)
#if (!defined(AIX32))
#include "lwp.h"
#include "lwpint.h"
#if defined(hpc)
#if defined UCONTEXT
/*
* Alternate aproach using setcontext and getcontext instead of setjmp and
* longjump. This should work on any SVr4 machine independant of
* architecture. Unfortunately some changes are still nessesary in lwp.c.
* Tested on IRIX 5.3
*/
void
lwpInitContext(struct lwpProc *newp, stack_t *spp)
{
getcontext(&newp->context);
newp->context.uc_stack.ss_sp = spp->ss_sp;
newp->context.uc_stack.ss_size = spp->ss_size;
makecontext(&newp->context, lwpEntryPoint, 0);
}
#elif defined(hpc)
static struct lwpProc *tempcontext;
struct lwpProc *initcontext = NULL;
@ -362,24 +376,6 @@ lwpInitContext(struct lwpProc *newp, void *sp)
newp->context[5] = (int)lwpEntryPoint;
}
#elif defined UCONTEXT
/*
* Alternate aproach using setcontext en getcontext in stead of setjmp and
* longjump. This should work on any SVr4 machine independant of
* architecture. Unfortunaltely some changes are still nessesary in lwp.c.
* Tested on IRIX 5.3
*/
void
lwpInitContext(struct lwpProc *newp, stack_t *spp)
{
getcontext(&newp->context);
newp->context.uc_stack.ss_sp = spp->ss_sp;
newp->context.uc_stack.ss_size = spp->ss_size;
makecontext(&newp->context, lwpEntryPoint, 0);
}
#elif defined(ALPHA)
#include <c_asm.h>
@ -416,5 +412,3 @@ lwpRestore(jmp_buf jb)
#endif
#endif
#endif