2002-10-19 Danny Smith <dannysmith@users.sourceforge.net>
+ * crt1.c: Define new macro __IN_MINGW_RUNTIME before including
+ stdlib.h.
+ Define WIN32_MEAN_AND_LEAN before including windows.h
+ * include/stdlib.h (_fmode): Protect declaration as dllimported
+ variable with __IN_MINGW_RUNTIME.
+
+2002-10-19 Igor Pechtchanski <pechtcha@cs.nyu.edu>
+
+ * crt1.c: Include stdlib.h.
+
+2002-10-19 Danny Smith <dannysmith@users.sourceforge.net>
+
* Makefile.in (CRT0S): Add txtmode.o binmode.o.
(MINGW_OBJS): Add txtmode.o.
(SRCDIST_FILES): Add txtmode.c binmode.c.
*
*/
+/* Hide the declaration of _fmode with dllimport attribute in stdlib.h.
+ This is not necessary with Mumit Khan's patches to gcc's winnt.c,
+ but those patches are still unofficial. */
+
+#define __IN_MINGW_RUNTIME
+#include <stdlib.h>
#include <stdio.h>
#include <io.h>
#include <process.h>
#include <float.h>
+#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <signal.h>
/* Global _fmode for this .exe, not the one in msvcrt.dll,
The default is set in txtmode.o in libmingw32.a */
-#undef _fmode
-extern int _fmode;
+/* Override the dllimport'd declarations in stdlib.h */
+#undef _fmode
+extern int _fmode;
extern int* __p__fmode(void); /* To access the dll _fmode */
/*
static void
_mingw32_init_fmode ()
{
- /* Don't set the file mode if the user hasn't set any value for it. */
+ /* Don't set the std file mode if the user hasn't set any value for it. */
if (_CRT_fmode)
{
_fmode = _CRT_fmode;
__set_app_type (__GUI_APP);
#endif
__mingw_CRTStartup ();
+return 0;
}
/*
* This variable determines the default file mode.
* TODO: Which flags work?
*/
-#ifndef __DECLSPEC_SUPPORTED
+#if !defined (__DECLSPEC_SUPPORTED) || defined (__IN_MINGW_RUNTIME)
#ifdef __MSVCRT__
extern int* _imp___fmode;
{ _exit(status); }
#endif
/* _onexit is MS extension. Use atexit for portability. */
-typedef int (* _onexit_t)(void);
+typedef int (* _onexit_t)(void);
_onexit_t _onexit( _onexit_t );
int _putenv (const char*);