* include/stdlib.h (_wpgmptr): Don't declare ifndef __MSVCRT__.

	* include/stdio.h (_IORW): Change constant to 0x0080.
	(TMP_MAX): Add new define.
	(_P_tmpdir): Ditto.
	(_wP_tmpdir): Ditto.
	(L_tmpnam): Change constant to 16.
	* include/malloc.h: Fix non-ANSI comment after #endif.
	* profile/Makefile.in (mkinstalldirs): Correct relative path.

4 files changed, 36 insertions, 11 deletions

diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index b1b8c3870..81b665588 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,16 @@
+2001-08-01  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* include/stdlib.h (_wpgmptr): Don't declare ifndef __MSVCRT__.
+	* include/stdio.h (_IORW): Change constant to 0x0080.
+	(TMP_MAX): Add new define.
+	(_P_tmpdir): Ditto.
+	(_wP_tmpdir): Ditto.
+	(L_tmpnam): Change constant to 16.
+
+2001-06-28  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* include/malloc.h: Fix non-ANSI comment after #endif.
+
 2001-06-11  Danny Smith  <danny_r_smith_2001@yahoo.co.nz>
 
 	* profile/configure.in: Make msvcrt.dll version default.
@@ -14,6 +27,10 @@
 
 2001-06-04  Earnie Boyd  <earnie@users.sourceforge.net>
 
+	* profile/Makefile.in (mkinstalldirs): Correct relative path.
+
+2001-06-04  Earnie Boyd  <earnie@users.sourceforge.net>
+
 	* include/_mingw.h: Change version to 1.0.
 	Makefile.in: Ditto.
 
diff --git a/winsup/mingw/include/malloc.h b/winsup/mingw/include/malloc.h
index 90a96b618..9711cc513 100644
--- a/winsup/mingw/include/malloc.h
+++ b/winsup/mingw/include/malloc.h
@@ -70,7 +70,7 @@ size_t	_msize (void*);
 }
 #endif
 
-#endif	RC_INVOKED
+#endif	/* RC_INVOKED */
 
 #endif /* Not _MALLOC_H_ */
 
diff --git a/winsup/mingw/include/stdio.h b/winsup/mingw/include/stdio.h
index c4c088500..d288f0009 100644
--- a/winsup/mingw/include/stdio.h
+++ b/winsup/mingw/include/stdio.h
@@ -43,10 +43,11 @@
 #endif	/* Not RC_INVOKED */
 
 
-/* Some flags for the iobuf structure provided by <paag@tid.es> */
+/* Flags for the iobuf structure  */
 #define	_IOREAD	1
 #define	_IOWRT	2
-#define	_IORW	4
+#define	_IORW	0x0080 /* opened as "r+w" */
+
 
 /*
  * The three standard file pointers provided by the run time library.
@@ -74,14 +75,24 @@
  */
 #define FOPEN_MAX	(20)
 
+/* After creating this many names, tmpnam and tmpfile return NULL */
+#define TMP_MAX	32767
+/*
+ * Tmpnam, tmpfile and, sometimes, _tempnam try to create
+ * temp files in the root directory of the current drive
+ * (not in pwd, as suggested by some older MS doc's).
+ * Redefining these macros does not effect the CRT functions.
+ */
+#define _P_tmpdir   "\\"
+#define _wP_tmpdir  L"\\"
+
 /*
  * The maximum size of name (including NUL) that will be put in the user
  * supplied buffer caName for tmpnam.
- * NOTE: This has not been determined by experiment, but based on the
- * maximum file name length above it is probably reasonable. I could be
- * wrong...
+ * Inferred from the size of the static buffer returned by tmpnam
+ * when passed a NULL argument. May actually be smaller.
  */
-#define	L_tmpnam	(260)
+#define L_tmpnam (16)
 
 #define _IOFBF		0x0000
 #define _IOLBF		0x0040
diff --git a/winsup/mingw/include/stdlib.h b/winsup/mingw/include/stdlib.h
index 64d8867d7..9bae20c31 100644
--- a/winsup/mingw/include/stdlib.h
+++ b/winsup/mingw/include/stdlib.h
@@ -263,14 +263,11 @@ wchar_t**  __p__wpgmptr(void);
 # ifndef __DECLSPEC_SUPPORTED
   extern char** __imp__pgmptr_dll;
 # define _pgmptr (*__imp__pgmptr_dll)
-  extern wchar_t** __imp_wpgmptr_dll;
-# define _wpgmptr (*__imp__wpgmptr_dll)
 # else /* __DECLSPEC_SUPPORTED */
  __MINGW_IMPORT char* _pgmptr_dll;
 # define _pgmptr _pgmptr_dll
- __MINGW_IMPORT wchar_t* _wpgmptr_dll;
-# define _wpgmptr _wpgmptr_dll
 # endif /* __DECLSPEC_SUPPORTED */
+/* no wide version in CRTDLL */
 #endif /* __MSVCRT__ */
 
 #endif /* Not __STRICT_ANSI__ */