* include/fcntl.h (_fmode): Remove declarations and

	compatibility defines.
	(_setmode, setmode): Remove prototypes.
	* include/stdlib (_fmode): Add declarations and
	compatibility defines.  Change type to int.
	* include/io.h (_setmode, setmode): Add prototypes.
	* samples/fmode/all.c: Adjust includes.
	* samples/fmode/test.c: Likewise.
	* crt1.c (_CRT_fmode): Declare as int.
	* CRTfmode.c (_CRT_fmode): Likewise.

	* include/stdlib: Remove comment about MB_CUR_MAX.

3 files changed, 29 insertions, 48 deletions

diff --git a/winsup/mingw/include/fcntl.h b/winsup/mingw/include/fcntl.h
index 7b7a8cb2a..add43ff0e 100644
--- a/winsup/mingw/include/fcntl.h
+++ b/winsup/mingw/include/fcntl.h
@@ -85,52 +85,6 @@
 
 #endif	/* Not _NO_OLDNAMES */
 
-
-#ifndef RC_INVOKED
-
-/*
- * This variable determines the default file mode.
- * TODO: Which flags work?
- */
-#ifndef __DECLSPEC_SUPPORTED
-
-#ifdef __MSVCRT__
-extern unsigned int* _imp___fmode;
-#define	_fmode	(*_imp___fmode)
-#else
-/* CRTDLL */
-extern unsigned int* _imp___fmode_dll;
-#define	_fmode	(*_imp___fmode_dll)
-#endif
-
-#else /* __DECLSPEC_SUPPORTED */
-
-#ifdef __MSVCRT__
-__MINGW_IMPORT unsigned int _fmode;
-#else /* ! __MSVCRT__ */
-__MINGW_IMPORT unsigned int _fmode_dll;
-#define	_fmode	_fmode_dll
-#endif /* ! __MSVCRT__ */
-
-#endif /* __DECLSPEC_SUPPORTED */
-
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-int	_setmode (int, int);
-
-#ifndef	_NO_OLDNAMES
-int	setmode (int, int);
-#endif	/* Not _NO_OLDNAMES */
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* Not RC_INVOKED */
-
 #endif	/* Not _FCNTL_H_ */
 
 #endif	/* Not __STRICT_ANSI__ */
diff --git a/winsup/mingw/include/io.h b/winsup/mingw/include/io.h
index 84014c794..288c3dc16 100644
--- a/winsup/mingw/include/io.h
+++ b/winsup/mingw/include/io.h
@@ -212,6 +212,7 @@ int		_open (const char*, int, ...);
 int		_open_osfhandle (long, int);
 int		_pipe (int *, unsigned int, int);
 int		_read (int, void*, unsigned int);
+int		_setmode (int, int);
 
 /* SH_... flags for nShFlags defined in share.h
  * Optional fourth argument is unsigned unPermissions */
@@ -262,6 +263,7 @@ int		isatty (int);
 long		lseek (int, long, int);
 int		open (const char*, int, ...);
 int		read (int, void*, unsigned int);
+int		setmode (int, int);
 int		sopen (const char*, int, int, ...);
 long		tell (int);
 int		umask (int);
diff --git a/winsup/mingw/include/stdlib.h b/winsup/mingw/include/stdlib.h
index 50a0f8178..468bac1af 100644
--- a/winsup/mingw/include/stdlib.h
+++ b/winsup/mingw/include/stdlib.h
@@ -120,8 +120,6 @@ __MINGW_IMPORT char**  __argv_dll;
 /*
  * Also defined in ctype.h.
  */
-
-/* Also defined in stdlib.h */
 #ifndef MB_CUR_MAX
 #ifdef __DECLSPEC_SUPPORTED
 # ifdef __MSVCRT__
@@ -142,6 +140,7 @@ __MINGW_IMPORT char**  __argv_dll;
 # endif 	/* not __MSVCRT */
 #endif  	/*  __DECLSPEC_SUPPORTED */
 #endif  /* MB_CUR_MAX */
+
 /* 
  * MS likes to declare errno in stdlib.h as well. 
  */
@@ -281,6 +280,32 @@ wchar_t**  __p__wpgmptr(void);
 /* no wide version in CRTDLL */
 #endif /* __MSVCRT__ */
 
+/*
+ * This variable determines the default file mode.
+ * TODO: Which flags work?
+ */
+#ifndef __DECLSPEC_SUPPORTED
+
+#ifdef __MSVCRT__
+extern int* _imp___fmode;
+#define	_fmode	(*_imp___fmode)
+#else
+/* CRTDLL */
+extern int* _imp___fmode_dll;
+#define	_fmode	(*_imp___fmode_dll)
+#endif
+
+#else /* __DECLSPEC_SUPPORTED */
+
+#ifdef __MSVCRT__
+__MINGW_IMPORT  int _fmode;
+#else /* ! __MSVCRT__ */
+__MINGW_IMPORT  int _fmode_dll;
+#define	_fmode	_fmode_dll
+#endif /* ! __MSVCRT__ */
+
+#endif /* __DECLSPEC_SUPPORTED */
+
 #endif /* Not __STRICT_ANSI__ */
 
 #ifdef	__GNUC__