diff options
| -rw-r--r-- | awk.h | 3 | ||||
| -rw-r--r-- | posix/ChangeLog | 5 | ||||
| -rw-r--r-- | posix/gawkmisc.c | 4 |
3 files changed, 10 insertions, 2 deletions
@@ -182,6 +182,9 @@ extern void *memset_ulong(void *dest, int val, unsigned long l); #ifdef HAVE_LIBSIGSEGV #include <sigsegv.h> +/* On Cygwin, sigsegv.h includes windows.h, which defines a datatype + called "__small", which in turn is defined to "small". */ +#undef small #else typedef void *stackoverflow_context_t; #define sigsegv_install_handler(catchsegv) signal(SIGSEGV, catchsig) diff --git a/posix/ChangeLog b/posix/ChangeLog index ceecc6b5..fdc034ac 100644 --- a/posix/ChangeLog +++ b/posix/ChangeLog @@ -1,3 +1,8 @@ +Mon May 2 23:38:06 2011 Corinna Vinschen <vinschen@redhat.com> + + * gawkmisc.c (cygwin_premain0): Use the real type for the secondnd + argument. + Fri Apr 1 11:50:59 2011 Arnold D. Robbins <arnold@skeeve.com> * gawkmisc.c (os_iastty): New function. diff --git a/posix/gawkmisc.c b/posix/gawkmisc.c index 6290ff57..f4bbf66b 100644 --- a/posix/gawkmisc.c +++ b/posix/gawkmisc.c @@ -257,7 +257,7 @@ files_are_same(char *path, SRCFILE *src) #ifdef __CYGWIN__ void -cygwin_premain0(int argc, char **argv, void *myself) +cygwin_premain0(int argc, char **argv, struct per_process *myself) { static struct __cygwin_perfile pf[] = { { "", O_RDONLY | O_TEXT }, @@ -268,7 +268,7 @@ cygwin_premain0(int argc, char **argv, void *myself) } void -cygwin_premain2(int argc, char **argv, void *myself) +cygwin_premain2(int argc, char **argv, struct per_process *myself) { setmode(fileno (stdin), O_TEXT); } |