From f33acdb808787b32318466688eb81ce3c48d28e2 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Thu, 22 Jun 2000 20:18:17 +0000 Subject: [PATCH] * include/sys/cygwin.h: Don't define parts of this file that rely on Windows headers unless the Windows header was previously included. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/include/sys/cygwin.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index d36d10985..4a2e39884 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +Thu Jun 22 15:51:17 2000 Christopher Faylor + + * include/sys/cygwin.h: Don't define parts of this file that rely on + Windows headers unless the Windows header was previously included. + Thu Jun 22 20:45:00 2000 Corinna Vinschen * registry.cc (load_registry_hive): Use HKEY_USERS when checking diff --git a/winsup/cygwin/include/sys/cygwin.h b/winsup/cygwin/include/sys/cygwin.h index e72202b29..2e1cc3387 100644 --- a/winsup/cygwin/include/sys/cygwin.h +++ b/winsup/cygwin/include/sys/cygwin.h @@ -39,11 +39,10 @@ extern void cygwin_premain1 (int argc, char **argv); extern void cygwin_premain2 (int argc, char **argv); extern void cygwin_premain3 (int argc, char **argv); -#ifdef _GNU_H_WINDOWS32_BASE +#ifdef WINVER /* included if is included */ extern int cygwin32_attach_handle_to_fd (char *, int, HANDLE, int, int); extern int cygwin_attach_handle_to_fd (char *, int, HANDLE, mode_t, unsigned); -#endif #include @@ -87,6 +86,7 @@ struct external_pinfo }; DWORD cygwin_internal (cygwin_getinfo_types, ...); +#endif /*WINVER*/ #define CW_NEXTPID 0x80000000 // or with pid to get next one