From 272e2587a20cf755e9180937aec2d64a7fc35b84 Mon Sep 17 00:00:00 2001 From: Richard Kenner Date: Sat, 2 Aug 1997 18:27:33 -0400 Subject: [PATCH] (_trampoline): Rework last change; both getpagesize and mprotect are in cygwin32. From-SVN: r14636 --- gcc/libgcc2.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/gcc/libgcc2.c b/gcc/libgcc2.c index 8f853f226ff..eb6a9ba00a0 100644 --- a/gcc/libgcc2.c +++ b/gcc/libgcc2.c @@ -2718,9 +2718,7 @@ __clear_cache (char *beg, char *end) /* Jump to a trampoline, loading the static chain address. */ -#ifdef WINNT - -#ifndef __CYGWIN32__ +#if defined(WINNT) && ! defined(__CYGWIN32__) long getpagesize() { @@ -2731,28 +2729,32 @@ long getpagesize() #endif } -#endif - #ifdef i386 extern int VirtualProtect (char *, int, int, int *) __attribute__((stdcall)); #endif -int mprotect(char *addr, int len, int prot) +int +mprotect (char *addr, int len, int prot) { int np, op; - if (prot == 7) np = 0x40; - else if (prot == 5) np = 0x20; - else if (prot == 4) np = 0x10; - else if (prot == 3) np = 0x04; - else if (prot == 1) np = 0x02; - else if (prot == 0) np = 0x01; + if (prot == 7) + np = 0x40; + else if (prot == 5) + np = 0x20; + else if (prot == 4) + np = 0x10; + else if (prot == 3) + np = 0x04; + else if (prot == 1) + np = 0x02; + else if (prot == 0) + np = 0x01; if (VirtualProtect (addr, len, np, &op)) return 0; else return -1; - } #endif -- 2.47.3