diff options
| author | Stu Grossman <grossman@cygnus> | 1996-08-09 16:02:46 +0000 |
|---|---|---|
| committer | Stu Grossman <grossman@cygnus> | 1996-08-09 16:02:46 +0000 |
| commit | 46b6fdbd1166730455bff6b74718bbee8793c9c6 (patch) | |
| tree | 1d20c683c7b550a236dad66887b0713ea70b6886 | |
| parent | bb1847ca10ff3e798e0f31f3c78d769de101b2eb (diff) | |
| download | fsf-binutils-gdb-46b6fdbd1166730455bff6b74718bbee8793c9c6.zip fsf-binutils-gdb-46b6fdbd1166730455bff6b74718bbee8793c9c6.tar.gz fsf-binutils-gdb-46b6fdbd1166730455bff6b74718bbee8793c9c6.tar.bz2 | |
* bind.c complete.c history.c readline.c: Don't include sys/file.h.
* complete.c display.c parens.c readline.c rldefs.h rltty.c
signals.c tilde.c: Change refs to _MSC_VER and __WIN32__ to _WIN32.
* signals.c (rl_signal_handler): Ifdef out kill if _WIN32.
* sysdep-norm.h: Ifdef out include of dirent.h if _WIN32.
Include malloc.h if _WIN32.
| -rw-r--r-- | readline/ChangeLog | 9 | ||||
| -rw-r--r-- | readline/rldefs.h | 17 | ||||
| -rw-r--r-- | readline/sysdep-norm.h | 6 |
3 files changed, 21 insertions, 11 deletions
diff --git a/readline/ChangeLog b/readline/ChangeLog index 8d9d11b..681b206 100644 --- a/readline/ChangeLog +++ b/readline/ChangeLog @@ -1,3 +1,12 @@ +Fri Aug 9 08:54:26 1996 Stu Grossman (grossman@critters.cygnus.com) + + * bind.c complete.c history.c readline.c: Don't include sys/file.h. + * complete.c display.c parens.c readline.c rldefs.h rltty.c + signals.c tilde.c: Change refs to _MSC_VER and __WIN32__ to _WIN32. + * signals.c (rl_signal_handler): Ifdef out kill if _WIN32. + * sysdep-norm.h: Ifdef out include of dirent.h if _WIN32. + Include malloc.h if _WIN32. + Thu Jul 18 15:59:35 1996 Michael Meissner <meissner@tiktok.cygnus.com> * rldefs.h (sys/uio.h) Before sys/stream.h is included under AIX, diff --git a/readline/rldefs.h b/readline/rldefs.h index 5eed2fd..d6b9b06 100644 --- a/readline/rldefs.h +++ b/readline/rldefs.h @@ -40,7 +40,7 @@ #define HAVE_BSD_SIGNALS /* #define USE_XON_XOFF */ -#if defined(__MSDOS__) || defined(_MSC_VER) +#if defined(__MSDOS__) || defined(_WIN32) #define NO_SYS_FILE #define SIGALRM 1234 #undef NEW_TTY_DRIVER @@ -58,15 +58,10 @@ # undef HAVE_BSD_SIGNALS #endif -#if defined (__WIN32__) && !defined(_MSC_VER) -#undef NEW_TTY_DRIVER -#define MINIMAL -#undef HAVE_BSD_SIGNALS -#define TERMIOS_TTY_DRIVER -#undef HANDLE_SIGNALS -#include <termios.h> -/*#define HAVE_POSIX_SIGNALS*/ -#endif +#define ScreenCols() 80 +#define ScreenRows() 24 +#define ScreenSetCursor() abort(); +#define ScreenGetCursor() abort(); /* System V machines use termio. */ #if !defined (_POSIX_VERSION) @@ -189,7 +184,7 @@ extern char *strchr (), *strrchr (); /* If on, then readline handles signals in a way that doesn't screw. */ #define HANDLE_SIGNALS -#if defined(__WIN32__) || defined(__MSDOS__) +#if defined(_WIN32) || defined(__MSDOS__) #undef HANDLE_SIGNALS #endif diff --git a/readline/sysdep-norm.h b/readline/sysdep-norm.h index cb89f43..d074cff 100644 --- a/readline/sysdep-norm.h +++ b/readline/sysdep-norm.h @@ -26,11 +26,17 @@ extern char *alloca (); #endif /* USGr4 */ #endif /* USG && TIOCGWINSZ */ +#ifndef _WIN32 #include <dirent.h> typedef struct dirent dirent; +#endif /* SVR4 systems should use <termios.h> rather than <termio.h>. */ #if defined (USGr4) #define _POSIX_VERSION #endif + +#ifdef _WIN32 +#include <malloc.h> +#endif |