Commit4631721

committed

Revert "Blind attempt at a Cygwin fix"

This reverts commite9282e9, which blewup in a pretty spectacular way. Re-introduce the original code while wesearch for a real fix.

1 parente9282e9 commit4631721Copy full SHA for 4631721

File tree

-7

lines changed

-7

lines changed

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -13075,12 +13075,6 @@ if test "$PORTNAME" = "cygwin"; then`
`13075`	`13075`	`;;`
`13076`	`13076`	`esac`
`13077`	`13077`
`13078`		`-case"$LIBOBJS"in`
`13079`		`-" win32security.$ac_objext" ) ;;`
`13080`		`-*) LIBOBJS="$LIBOBJS win32security.$ac_objext"`
`13081`		`- ;;`
`13082`		`-esac`
`13083`		`-`
`13084`	`13078`	`fi`
`13085`	`13079`
`13086`	`13080`	`ac_fn_c_check_decl"$LINENO""sys_siglist""ac_cv_have_decl_sys_siglist""#include <signal.h>`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1596,7 +1596,6 @@ fi`
`1596`	`1596`	`# Cygwin needs only a bit of that`
`1597`	`1597`	`if test "$PORTNAME" = "cygwin"; then`
`1598`	`1598`	`AC_LIBOBJ(dirmod)`
`1599`		`- AC_LIBOBJ(win32security)`
`1600`	`1599`	`fi`
`1601`	`1600`
`1602`	`1601`	`AC_CHECK_DECLS([sys_siglist], [], [],`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -212,6 +212,15 @@ write_stderr(const char *fmt,...)`
`212`	`212`	`vfprintf(stderr,fmt,ap);`
`213`	`213`	`#else`
`214`	`214`
	`215`	`+/*`
	`216`	`+ * On Cygwin, we don't yet have a reliable mechanism to detect when`
	`217`	`+ * we're being run as a service, so fall back to the old (and broken)`
	`218`	`+ * stderr test.`
	`219`	`+ */`
	`220`	`+#ifdef__CYGWIN__`
	`221`	`+#definepgwin32_is_service()(isatty(fileno(stderr)))`
	`222`	`+#endif`
	`223`	`+`
`215`	`224`	`/*`
`216`	`225`	`* On Win32, we print to stderr if running on a console, or write to`
`217`	`226`	`* eventlog if running as a service`

Comments

(0)