Bring Cygnus versions into the trunk, keeping our local patches

2 files changed, 30 insertions, 11 deletions

diff --git a/gnu/usr.bin/binutils/include/mpw/ChangeLog b/gnu/usr.bin/binutils/include/mpw/ChangeLog
index 2d26ad55525..8dbad87eab4 100644
--- a/gnu/usr.bin/binutils/include/mpw/ChangeLog
+++ b/gnu/usr.bin/binutils/include/mpw/ChangeLog
@@ -1,3 +1,16 @@
+Tue Feb 27 12:23:04 1996  Raymond Jou  <rjou@mexican.cygnus.com>
+
+	* mpw.h (HAVE_VPRINTF): Add and define to have the value 1.
+
+Fri Dec 29 14:40:46 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw.h (HAVE_STDLIB_H, etc): Define to have the value 1.
+	(HAVE_FCNTL_H): Define.
+
+Mon Dec 11 15:39:06 1995  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw.h (open, access): Define as mpw_open and mpw_access.
+
 Thu Nov  9 15:38:37 1995  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* mpw.h: Include unix.h if USE_MW_HEADERS, otherwise include
diff --git a/gnu/usr.bin/binutils/include/mpw/mpw.h b/gnu/usr.bin/binutils/include/mpw/mpw.h
index 782f8c35cf8..58702e725ff 100644
--- a/gnu/usr.bin/binutils/include/mpw/mpw.h
+++ b/gnu/usr.bin/binutils/include/mpw/mpw.h
@@ -18,17 +18,19 @@
 #include <ctype.h>
 #include <errno.h>
 
-#define HAVE_TIME_T_IN_TIME_H
+#define HAVE_TIME_T_IN_TIME_H 1
 
-#define HAVE_STDLIB_H
+#define HAVE_STDLIB_H 1
 
-#define HAVE_ERRNO_H
+#define HAVE_ERRNO_H 1
 
-#define HAVE_STDDEF_H
+#define HAVE_STDDEF_H 1
 
-#define HAVE_STRING_H
+#define HAVE_STRING_H 1
 
-#define HAVE_STDARG_H
+#define HAVE_STDARG_H 1
+
+#define HAVE_VPRINTF 1
 
 #ifdef USE_MW_HEADERS
 
@@ -40,6 +42,8 @@
 #include <ioctl.h>
 #include <sys/stat.h>
 
+#define HAVE_FCNTL_H 1
+
 #ifndef	O_ACCMODE
 #define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR)
 #endif
@@ -85,13 +89,11 @@ FILE *fdopen(int fildes, const char *mode);
 #include <spin.h>
 
 #ifdef MPW_C
-
 #undef  __PTR_TO_INT
 #define __PTR_TO_INT(P) ((int)(P))
 #undef __INT_TO_PTR
 #define __INT_TO_PTR(P) ((char *)(P))
-
-#endif
+#endif /* MPW_C */
 
 #define NO_FCNTL
 
@@ -101,8 +103,10 @@ FILE *mpw_fopen ();
 int mpw_fseek ();
 int mpw_fread ();
 int mpw_fwrite ();
-void mpw_abort ();
+int mpw_access ();
+int mpw_open ();
 int mpw_creat ();
+void mpw_abort (void);
 
 /* Map these standard functions to improved versions in libiberty. */
 
@@ -110,8 +114,10 @@ int mpw_creat ();
 #define fseek mpw_fseek
 #define fread mpw_fread
 #define fwrite mpw_fwrite
-#define abort mpw_abort
+#define open mpw_open
+#define access mpw_access
 #define creat mpw_creat
+#define abort mpw_abort
 
 #define POSIX_UTIME