* 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.

diff --git a/readline/ChangeLog b/readline/ChangeLog
index 8d9d11b0fa6fc0f7ef617c6b1e8f11a0ea0a1955..681b20643f38d40305eecf8c68be77488b97130f 100644 (file)
--- 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 5eed2fd5eb7cc57a6d726c3ffe2e72da36712d65..d6b9b065070354a89147e1aa2706ad68bea6b402 100644 (file)
--- 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 cb89f437797bfc43d8de4f2cabc70c78a0385123..d074cff761472dc605094cc1f58a450abc6685d6 100644 (file)
--- 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