* rldefs.c: Get rid of define of SIGALRM if _WIN32 or __MSDOS__.

	* Don't define ScreenCols/ScreenRows/... if cygwin32.
	* sysdep-norm.h:  Don't include <malloc.h> if cygwin32.

diff --git a/readline/ChangeLog b/readline/ChangeLog
index e92f1cd..772212d 100644 (file)
--- a/readline/ChangeLog
+++ b/readline/ChangeLog
@@ -1,3 +1,9 @@
+Sun Aug 11 21:06:26 1996  Stu Grossman  (grossman@critters.cygnus.com)
+
+       * rldefs.c:  Get rid of define of SIGALRM if _WIN32 or __MSDOS__.
+       * Don't define ScreenCols/ScreenRows/... if cygwin32.
+       * sysdep-norm.h:  Don't include <malloc.h> if cygwin32.
+
 Sun Aug 11 14:59:09 1996  Fred Fish  <fnf@cygnus.com>
 
        * rldefs.h:  If __osf__is defined, include <termio.h> instead of

diff --git a/readline/sysdep-norm.h b/readline/sysdep-norm.h
index d074cff..6cf1f34 100644 (file)
--- a/readline/sysdep-norm.h
+++ b/readline/sysdep-norm.h
@@ -37,6 +37,6 @@ typedef struct dirent dirent;
 #define _POSIX_VERSION
 #endif
 
-#ifdef _WIN32
+#if defined _WIN32 && !defined __GNUC__
 #include <malloc.h>
 #endif