diff options
| author | Christopher Faylor <me@cgf.cx> | 2000-06-23 00:18:17 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2000-06-23 00:18:17 +0400 |
| commit | f33acdb808787b32318466688eb81ce3c48d28e2 (patch) | |
| tree | 7a7dfc1587b085435c21059157e25c2d7edbc84d /winsup/cygwin | |
| parent | 5af1047b411b28abac69959fcb9bb81e749d7dac (diff) | |
* include/sys/cygwin.h: Don't define parts of this file that rely on Windows
headers unless the Windows header was previously included.
Diffstat (limited to 'winsup/cygwin')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 <cgf@cygnus.com> + + * 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 <corinna@vinschen.de> * 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 <windows.h> 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 <sys/resource.h> @@ -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 |