From 00103b7f5e2c2963c2b4706634535ce0055530ea Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 18 Mar 2008 09:57:33 +0000 Subject: [PATCH] * include/sys/cygwin.h: Revert erroneous move of `#ifdef WINVER' to another location. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/include/sys/cygwin.h | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 37c6a7db0..c7ba806f8 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2008-03-18 Corinna Vinschen + + * include/sys/cygwin.h: Revert erroneous move of `#ifdef WINVER' to + another location. + 2008-03-14 Corinna Vinschen * fcntl.cc (fcntl_worker): Protect with a 'myfault'. diff --git a/winsup/cygwin/include/sys/cygwin.h b/winsup/cygwin/include/sys/cygwin.h index 5a7c14df0..f3aa9012d 100644 --- a/winsup/cygwin/include/sys/cygwin.h +++ b/winsup/cygwin/include/sys/cygwin.h @@ -169,6 +169,8 @@ enum PID_EXITED = 0x80000000 /* Free entry. */ }; +#ifdef WINVER + /* This lives in the app and is initialized before jumping into the DLL. It should only contain stuff which the user's process needs to see, or which is needed before the user pointer is initialized, or is needed to @@ -259,7 +261,6 @@ extern void cygwin_premain1 (int argc, char **argv, struct per_process *); extern void cygwin_premain2 (int argc, char **argv, struct per_process *); extern void cygwin_premain3 (int argc, char **argv, struct per_process *); -#ifdef WINVER #ifdef _PATH_PASSWD extern HANDLE cygwin_logon_user (const struct passwd *, const char *); #endif