Map fileno to _fileno for mingw32. Map fstat to _fstat.

	* glib.h (Win32): Map fileno to _fileno for mingw32. Map fstat to
 	_fstat.

	* README.win32: Advice also to remove -lmoldname from the
 	patch to the egcs-1.1.2 spec file patch.

diff --git a/ChangeLog b/ChangeLog
index fc4ab5c..84a4059 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1999-05-12  Tor Lillqvist  <tml@iki.fi>
+
+       * glib.h (Win32): Map fileno to _fileno for mingw32. Map fstat to
+       _fstat.
+
+       * README.win32: Advice also to remove -lmoldname from the
+       patch to the egcs-1.1.2 spec file patch.
+
 Wed May 12 00:23:55 CDT 1999 Shawn T. Amundson <amundson@gtk.org>
 
        * gmodule/Makefile.am: Another small fix.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index fc4ab5c..84a4059 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+1999-05-12  Tor Lillqvist  <tml@iki.fi>
+
+       * glib.h (Win32): Map fileno to _fileno for mingw32. Map fstat to
+       _fstat.
+
+       * README.win32: Advice also to remove -lmoldname from the
+       patch to the egcs-1.1.2 spec file patch.
+
 Wed May 12 00:23:55 CDT 1999 Shawn T. Amundson <amundson@gtk.org>
 
        * gmodule/Makefile.am: Another small fix.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fc4ab5c..84a4059 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+1999-05-12  Tor Lillqvist  <tml@iki.fi>
+
+       * glib.h (Win32): Map fileno to _fileno for mingw32. Map fstat to
+       _fstat.
+
+       * README.win32: Advice also to remove -lmoldname from the
+       patch to the egcs-1.1.2 spec file patch.
+
 Wed May 12 00:23:55 CDT 1999 Shawn T. Amundson <amundson@gtk.org>
 
        * gmodule/Makefile.am: Another small fix.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index fc4ab5c..84a4059 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+1999-05-12  Tor Lillqvist  <tml@iki.fi>
+
+       * glib.h (Win32): Map fileno to _fileno for mingw32. Map fstat to
+       _fstat.
+
+       * README.win32: Advice also to remove -lmoldname from the
+       patch to the egcs-1.1.2 spec file patch.
+
 Wed May 12 00:23:55 CDT 1999 Shawn T. Amundson <amundson@gtk.org>
 
        * gmodule/Makefile.am: Another small fix.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index fc4ab5c..84a4059 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+1999-05-12  Tor Lillqvist  <tml@iki.fi>
+
+       * glib.h (Win32): Map fileno to _fileno for mingw32. Map fstat to
+       _fstat.
+
+       * README.win32: Advice also to remove -lmoldname from the
+       patch to the egcs-1.1.2 spec file patch.
+
 Wed May 12 00:23:55 CDT 1999 Shawn T. Amundson <amundson@gtk.org>
 
        * gmodule/Makefile.am: Another small fix.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index fc4ab5c..84a4059 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+1999-05-12  Tor Lillqvist  <tml@iki.fi>
+
+       * glib.h (Win32): Map fileno to _fileno for mingw32. Map fstat to
+       _fstat.
+
+       * README.win32: Advice also to remove -lmoldname from the
+       patch to the egcs-1.1.2 spec file patch.
+
 Wed May 12 00:23:55 CDT 1999 Shawn T. Amundson <amundson@gtk.org>
 
        * gmodule/Makefile.am: Another small fix.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fc4ab5c..84a4059 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+1999-05-12  Tor Lillqvist  <tml@iki.fi>
+
+       * glib.h (Win32): Map fileno to _fileno for mingw32. Map fstat to
+       _fstat.
+
+       * README.win32: Advice also to remove -lmoldname from the
+       patch to the egcs-1.1.2 spec file patch.
+
 Wed May 12 00:23:55 CDT 1999 Shawn T. Amundson <amundson@gtk.org>
 
        * gmodule/Makefile.am: Another small fix.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fc4ab5c..84a4059 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+1999-05-12  Tor Lillqvist  <tml@iki.fi>
+
+       * glib.h (Win32): Map fileno to _fileno for mingw32. Map fstat to
+       _fstat.
+
+       * README.win32: Advice also to remove -lmoldname from the
+       patch to the egcs-1.1.2 spec file patch.
+
 Wed May 12 00:23:55 CDT 1999 Shawn T. Amundson <amundson@gtk.org>
 
        * gmodule/Makefile.am: Another small fix.

diff --git a/README.win32 b/README.win32
index ba48521..95841c7 100644 (file)
--- a/README.win32
+++ b/README.win32
@@ -84,14 +84,15 @@ typically is installed as
 C:/cygnus/cygwin-b20/H-i586-cygwin32/lib/gcc-lib/i586-cygwin32/egcs-2.91.66/specs.
 
 Sorry for the illegibility of this diff, but the specs file is like
-that... This diff replaces -lcrtdll with -lmsvcrt, replaces crt1 with
-crt2, and defines __MSVCRT__.
+that... This patch replaces -lcrtdll with -lmsvcrt, replaces crt1 with
+crt2, removes -lmoldname (because that might pull in crtdll.dll), and
+defines __MSVCRT__.
 
 --- specs.ORIG Sun Apr 25 00:40:40 1999
 +++ specs      Sun Apr 25 00:48:04 1999
 @@ -23 +23 @@
 -%{pg:-lgmon}                   %{!mno-cygwin:-lcygwin}                   %{mno-cygwin:-lmingw32 -lmoldname -lcrtdll}                   %{mwindows:-luser32 -lgdi32 -lcomdlg32}                  -lkernel32 -ladvapi32 -lshell32
-+%{pg:-lgmon}                   %{!mno-cygwin:-lcygwin}                   %{mno-cygwin:-lmingw32 -lmoldname -lmsvcrt}                   %{mwindows:-luser32 -lgdi32 -lcomdlg32}                  -lkernel32 -ladvapi32 -lshell32
++%{pg:-lgmon}                   %{!mno-cygwin:-lcygwin}                   %{mno-cygwin:-lmingw32 -lmsvcrt}                   %{mwindows:-luser32 -lgdi32 -lcomdlg32}             -lkernel32 -ladvapi32 -lshell32
 @@ -29 +29 @@
 -%{mdll: %{!mno-cygwin:dllcrt0%O%s}                                 %{mno-cygwin:dllcrt1%O%s}}                         %{!mdll: %{!mno-cygwin:crt0%O%s}                                  %{mno-cygwin:crt1%O%s} %{pg:gcrt0%O%s}}
 +%{mdll: %{!mno-cygwin:dllcrt0%O%s}                                 %{mno-cygwin:dllcrt2%O%s}}                         %{!mdll: %{!mno-cygwin:crt0%O%s}                                  %{mno-cygwin:crt2%O%s} %{pg:gcrt0%O%s}}

diff --git a/glib.h b/glib.h
index df3dd5c..b1a4148 100644 (file)
--- a/glib.h
+++ b/glib.h
@@ -2762,7 +2762,7 @@ typedef int pid_t;
  * <windows.h> every now and then...).
  *
  * You still need to include the appropriate headers to get the
- * prototypes, <io.h> or <direct.h>.
+ * prototypes, like <stdio.h>, <io.h>, <direct.h> or <process.h>.
  *
  * For some functions, we provide emulators in glib, which are prefixed
  * with gwin_.
@@ -2772,7 +2772,9 @@ typedef int pid_t;
 #    define access             _access
 #ifdef __GNUC__
 #    define stat               _stat
+#    define fileno             _fileno
 #endif
+#    define fstat              _fstat
 #    define unlink             _unlink
 #    define open               _open
 #    define read               _read

diff --git a/glib/glib.h b/glib/glib.h
index df3dd5c..b1a4148 100644 (file)
--- a/glib/glib.h
+++ b/glib/glib.h
@@ -2762,7 +2762,7 @@ typedef int pid_t;
  * <windows.h> every now and then...).
  *
  * You still need to include the appropriate headers to get the
- * prototypes, <io.h> or <direct.h>.
+ * prototypes, like <stdio.h>, <io.h>, <direct.h> or <process.h>.
  *
  * For some functions, we provide emulators in glib, which are prefixed
  * with gwin_.
@@ -2772,7 +2772,9 @@ typedef int pid_t;
 #    define access             _access
 #ifdef __GNUC__
 #    define stat               _stat
+#    define fileno             _fileno
 #endif
+#    define fstat              _fstat
 #    define unlink             _unlink
 #    define open               _open
 #    define read               _read