Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 4631721

Browse files
committed
Revert "Blind attempt at a Cygwin fix"
This reverts commit e9282e9, which blew up in a pretty spectacular way. Re-introduce the original code while we search for a real fix.
1 parent e9282e9 commit 4631721

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

configure

-6
Original file line numberDiff line numberDiff line change
@@ -13075,12 +13075,6 @@ if test "$PORTNAME" = "cygwin"; then
1307513075
;;
1307613076
esac
1307713077

13078-
case " $LIBOBJS " in
13079-
*" win32security.$ac_objext "* ) ;;
13080-
*) LIBOBJS="$LIBOBJS win32security.$ac_objext"
13081-
;;
13082-
esac
13083-
1308413078
fi
1308513079

1308613080
ac_fn_c_check_decl "$LINENO" "sys_siglist" "ac_cv_have_decl_sys_siglist" "#include <signal.h>

configure.in

-1
Original file line numberDiff line numberDiff line change
@@ -1596,7 +1596,6 @@ fi
15961596
# Cygwin needs only a bit of that
15971597
if test "$PORTNAME" = "cygwin"; then
15981598
AC_LIBOBJ(dirmod)
1599-
AC_LIBOBJ(win32security)
16001599
fi
16011600

16021601
AC_CHECK_DECLS([sys_siglist], [], [],

src/bin/pg_ctl/pg_ctl.c

+9
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,15 @@ write_stderr(const char *fmt,...)
212212
vfprintf(stderr, fmt, ap);
213213
#else
214214

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+
#define pgwin32_is_service() (isatty(fileno(stderr)))
222+
#endif
223+
215224
/*
216225
* On Win32, we print to stderr if running on a console, or write to
217226
* eventlog if running as a service

0 commit comments

Comments
 (0)