* 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.
This commit is contained in:
Stu Grossman 1996-08-09 16:02:46 +00:00
parent bb1847ca10
commit 46b6fdbd11
3 changed files with 21 additions and 11 deletions

View File

@ -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,

View File

@ -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

View File

@ -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