diff options
author | davek <davek@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-12-06 20:31:31 +0000 |
---|---|---|
committer | davek <davek@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-12-06 20:31:31 +0000 |
commit | 5847cd83023299ba7b9d2621e49515a4a2f41ff9 (patch) | |
tree | 6005299b48b36986550a31c13d9a70d4ec01a4ce /gcc/ada/sysdep.c | |
parent | d2b14329ba53c66247bd91177ff0a33187b93739 (diff) |
* gcc-interface/Makefile.in (LIBGNAT_TARGET_PAIRS [windows targets]):
Correctly detect cygwin, which no longer has the '32' suffix, and use
appropriate implementations of the sockets and memory packages.
* sysdep.c (WIN_SETMODE): New define to choose the correct spelling of
setmode/_setmode for MinGW and Cygwin, respectively.
(__gnat_set_binary_mode [windows targets]): Use the above, and enable
the windows version for Cygwin as well as MinGW.
(__gnat_set_text_mode [windows targets]): Likewise.
(__gnat_ttyname [windows targets]): Provide a Cygwin implementation
in addition to the MinGW version.
(__gnat_is_windows_xp): Make available to Cygwin as well as MinGW.
(__gnat_get_stack_bounds): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182065 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/sysdep.c')
-rw-r--r-- | gcc/ada/sysdep.c | 53 |
1 files changed, 38 insertions, 15 deletions
diff --git a/gcc/ada/sysdep.c b/gcc/ada/sysdep.c index a4456f56a24..2b99a32b132 100644 --- a/gcc/ada/sysdep.c +++ b/gcc/ada/sysdep.c @@ -120,38 +120,44 @@ extern struct tm *localtime_r(const time_t *, struct tm *); */ -#if defined(WINNT) +#if defined (WINNT) || defined (__CYGWIN__) const char __gnat_text_translation_required = 1; +#ifdef __CYGWIN__ +#define WIN_SETMODE setmode +#include <io.h> +#else +#define WIN_SETMODE _setmode +#endif + void __gnat_set_binary_mode (int handle) { - _setmode (handle, O_BINARY); + WIN_SETMODE (handle, O_BINARY); } void __gnat_set_text_mode (int handle) { - _setmode (handle, O_TEXT); + WIN_SETMODE (handle, O_TEXT); } -#ifdef __MINGW32__ -#include <windows.h> - -/* Return the name of the tty. Under windows there is no name for - the tty, so this function, if connected to a tty, returns the generic name - "console". */ +#ifdef __CYGWIN__ char * __gnat_ttyname (int filedes) { - if (isatty (filedes)) - return "console"; - else - return NULL; + extern char *ttyname (int); + + return ttyname (filedes); } +#endif /* __CYGWIN__ */ + +#if defined (__CYGWIN__) || defined (__MINGW32__) +#include <windows.h> + #ifndef RTX int __gnat_is_windows_xp (void); @@ -178,7 +184,7 @@ __gnat_is_windows_xp (void) return is_win_xp; } -#endif +#endif /* !RTX */ /* Get the bounds of the stack. The stack pointer is supposed to be initialized to BASE when a thread is created and the stack can be extended @@ -198,7 +204,24 @@ __gnat_get_stack_bounds (void **base, void **limit) *limit = tib->StackLimit; } -#endif /* !__MINGW32__ */ +#endif /* __CYGWIN__ || __MINGW32__ */ + +#ifdef __MINGW32__ + +/* Return the name of the tty. Under windows there is no name for + the tty, so this function, if connected to a tty, returns the generic name + "console". */ + +char * +__gnat_ttyname (int filedes) +{ + if (isatty (filedes)) + return "console"; + else + return NULL; +} + +#endif /* __MINGW32__ */ #else |