* include/_mingw.h: Increment version to 2.0.

	* Makefile.in: Ditto.

	Merge from trunk:
	2002-04-09  Earnie Boyd  <earnie@users.sf.net>
	* Makefile.in: Use bzip2 compression for Cygwin target.

5 files changed, 377 insertions, 289 deletions

diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index b61b8e58e17..d47e21add6a 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,12 @@
+2002-04-11  Danny Smith  <dannysmith@sourceforge.users.net>
+
+	* include/_mingw.h: Increment version to 2.0.
+	* Makefile.in: Ditto.
+
+	Merge from trunk:
+	2002-04-09  Earnie Boyd  <earnie@users.sf.net>
+	* Makefile.in: Use bzip2 compression for Cygwin target.
+
 2002-04-10  Danny Smith  <dannysmith@sourceforge.users.net>
 
 	* mingwex/mingw-fseek.c: New file, based on Mumit Khan
diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in
index 8886a18a0f6..4ebce2b5fa0 100644
--- a/winsup/mingw/Makefile.in
+++ b/winsup/mingw/Makefile.in
@@ -18,7 +18,7 @@
 # This makefile requires GNU make.
 
 PACKAGE = mingw-runtime
-VERSION = 1.3
+VERSION = 2.0
 CYGRELEASE = 1
 
 VPATH = @srcdir@
@@ -112,8 +112,11 @@ DLLTOOL_FLAGS = --as $(AS_FOR_TARGET)
 DLLWRAP = @DLLWRAP@
 DLLWRAP_FOR_TARGET = $(DLLWRAP)
 DLLWRAP_FLAGS = --dlltool $(DLLTOOL) --as $(AS) --driver-name $(CC)
-TAR = tar
 
+TAR = tar
+TARFLAGS = z
+TARFILEEXT = .tar.gz
+ 
 SUBDIRS := @SUBDIRS@
 
 FLAGS_TO_PASS:=\
@@ -137,7 +140,10 @@ FLAGS_TO_PASS:=\
 	inst_includedir="$(inst_includedir)" \
 	inst_libdir="$(inst_libdir)" \
 	prefix="$(prefix)" \
-	target_alias="$(target_alias)"
+	target_alias="$(target_alias)" \
+	TAR="$(TAR)" \
+	TARFLAGS="$(TARFLAGS)" \
+	TARFILEEXT="$(TARFILEEXT)"
 
 CRT0S = crt1.o dllcrt1.o crt2.o dllcrt2.o CRT_noglob.o crtmt.o crtst.o
 MINGW_OBJS = CRTglob.o CRTfmode.o CRTinit.o  dllmain.o gccmain.o \
@@ -272,6 +278,11 @@ else
    endif
 endif
 
+ifneq (,$(findstring cygwin, $(target_alias)))
+  TARFLAGS = j
+  TARFILEEXT = .tar.bz2
+endif
+
 dist: srcdist bindist
 
 srcdist:
@@ -291,7 +302,7 @@ srcdist:
 	cp $(srcdir)/include/sys/*.h $(distdir)/include/sys/
 #end FIXME
 	rm -f $(distdir)-src.tar.gz
-	$(TAR) czf $(distdir)-src.tar.gz $(distdir)
+	$(TAR) $(TARFLAGS)cf $(distdir)-src$(TARFILEEXT) $(distdir)
 
 
 bindist:
@@ -301,7 +312,7 @@ bindist:
 	$(MAKE) install prefix=$(shell pwd)/$(distdir)
 	rm -f $(distdir).tar.gz
 	cd $(distdir); \
-	$(TAR) czf ../$(distdir).tar.gz *
+	$(TAR) $(TARFLAGS)cf ../$(distdir)$(TARFILEEXT) *
 
 snapshot: 
 	make dist SNAPDATE=$(shell date '+%Y%m%d')
diff --git a/winsup/mingw/include/_mingw.h b/winsup/mingw/include/_mingw.h
new file mode 100644
index 00000000000..7606879429c
--- /dev/null
+++ b/winsup/mingw/include/_mingw.h
@@ -0,0 +1,68 @@
+/*
+ * _mingw.h
+ *
+ * Mingw specific macros included by ALL include files. 
+ *
+ * This file is part of the Mingw32 package.
+ *
+ * Contributors:
+ *  Created by Mumit Khan  <khan@xraylith.wisc.edu>
+ *
+ *  THIS SOFTWARE IS NOT COPYRIGHTED
+ *
+ *  This source code is offered for use in the public domain. You may
+ *  use, modify or distribute it freely.
+ *
+ *  This code is distributed in the hope that it will be useful but
+ *  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
+ *  DISCLAIMED. This includes but is not limited to warranties of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ */
+
+#ifndef __MINGW_H
+#define __MINGW_H
+
+/* These are defined by the user (or the compiler)
+   to specify how identifiers are imported from a DLL.
+
+   __DECLSPEC_SUPPORTED    Defined if dllimport attribute is supported.
+   __MINGW_IMPORT          The attribute definition to specify imported
+                           variables/functions. 
+   __MINGW32_VERSION       Runtime version.
+   __MINGW32_MAJOR_VERSION Runtime major version.
+   __MINGW32_MINOR_VERSION Runtime minor version.
+   __MINGW32_BUILD_DATE    Runtime build date.
+   
+   Other macros:
+
+   __int64                 define to be long long. Using a typedef can
+                           tweak bugs in the C++ parser.
+  
+   All headers should include this first, and then use __DECLSPEC_SUPPORTED
+   to choose between the old ``__imp__name'' style or __MINGW_IMPORT
+   style declarations.  */
+
+#ifndef __GNUC__
+# define __MINGW_IMPORT  __declspec(dllimport)
+# define __DECLSPEC_SUPPORTED
+#else /* __GNUC__ */
+# ifdef __declspec
+   /* note the extern at the end. This is needed to work around GCC's
+      limitations in handling dllimport attribute.  */
+#  define __MINGW_IMPORT __attribute__((dllimport)) extern
+#  define __DECLSPEC_SUPPORTED
+# else
+#  undef __DECLSPEC_SUPPORTED
+#  undef __MINGW_IMPORT
+# endif 
+# undef __int64
+# define __int64 long long
+#endif /* __GNUC__ */
+
+#define __MINGW32_VERSION 2.0
+#define __MINGW32_MAJOR_VERSION 2
+#define __MINGW32_MINOR_VERSION 0
+
+#endif /* __MINGW_H */
+
diff --git a/winsup/mingw/moldname-crtdll.def b/winsup/mingw/moldname-crtdll.def
index 3b641ebd683..f27fa1562db 100644
--- a/winsup/mingw/moldname-crtdll.def
+++ b/winsup/mingw/moldname-crtdll.def
@@ -1,142 +1,142 @@
-;

-; moldname-crtdll.def

-;

-; Exports from the runtime except that these exports are actually preceeded

-; by a underscore in the actual DLL. These correspond to functions which

-; are non-ANSI and were prefixed with an underscore to avoid name space

-; clutter. However many, in fact most programs still use a few of these

-; functions without the underscore. This .def file is specially processed

-; to make those non-underscored name function calls call the equivalent

-; underscored functions.

-;

-; Contributors:

-; Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>

-; Maintained by Mumit Khan <khan@xraylith.wisc.edu>

-;

-; THIS SOFTWARE IS NOT COPYRIGHTED

-;

-; This source code is offered for use in the public domain. You may

-; use, modify or distribute it freely.

-;

-; This code is distributed in the hope that it will be useful but

-; WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY

-; DISCLAMED. This includes but is not limited to warrenties of

-; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

-;

-EXPORTS

-access

-beep

-cabs

-chdir

-chmod

-chsize

-close

-creat

-cwait

-

-

-

-dup

-dup2

-ecvt

-eof

-execl

-execle

-execlp

-execlpe

-execv

-execve

-execvp

-execvpe

-fcvt

-fdopen

-fgetchar

-fgetwchar

-filelength

-fileno

-fpreset

-fputchar

-fputwchar

-fstat

-ftime

-gcvt

-getch

-getche

-getcwd

-getpid

-getw

-heapwalk

-hypot

-isatty

-itoa

-j0

-j1

-jn

-kbhit

-lseek

-ltoa

-memccpy

-memicmp

-mkdir

-mktemp

-open

-pclose

-popen

-putch

-putenv

-putw

-read

-rmdir

-searchenv

-seterrormode

-setmode

-sleep

-sopen

-spawnl

-spawnle

-spawnlp

-spawnlpe

-spawnv

-spawnve

-spawnvp

-spawnvpe

-stat

-strcmpi

-strdup

-stricmp

-stricoll

-strlwr

-strnicmp

-strnset

-strrev

-strset

-strupr

-swab

-tell

-tempnam

-

-

-

-; export tzname for both. See <time.h>

-tzname DATA

-tzset

-umask

-ungetch

-unlink

-utime

-wcsdup

-wcsicmp

-wcsicoll

-wcslwr

-wcsnicmp

-wcsnset

-wcsrev

-wcsset

-wcsupr

-

-

-

-write

-y0

-y1

-yn

+;
+; moldname-crtdll.def
+;
+; Exports from the runtime except that these exports are actually preceeded
+; by a underscore in the actual DLL. These correspond to functions which
+; are non-ANSI and were prefixed with an underscore to avoid name space
+; clutter. However many, in fact most programs still use a few of these
+; functions without the underscore. This .def file is specially processed
+; to make those non-underscored name function calls call the equivalent
+; underscored functions.
+;
+; Contributors:
+; Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
+; Maintained by Mumit Khan <khan@xraylith.wisc.edu>
+;
+; THIS SOFTWARE IS NOT COPYRIGHTED
+;
+; This source code is offered for use in the public domain. You may
+; use, modify or distribute it freely.
+;
+; This code is distributed in the hope that it will be useful but
+; WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
+; DISCLAMED. This includes but is not limited to warrenties of
+; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+;
+EXPORTS
+access
+beep
+cabs
+chdir
+chmod
+chsize
+close
+creat
+cwait
+
+
+
+dup
+dup2
+ecvt
+eof
+execl
+execle
+execlp
+execlpe
+execv
+execve
+execvp
+execvpe
+fcvt
+fdopen
+fgetchar
+fgetwchar
+filelength
+fileno
+fpreset
+fputchar
+fputwchar
+fstat
+ftime
+gcvt
+getch
+getche
+getcwd
+getpid
+getw
+heapwalk
+hypot
+isatty
+itoa
+j0
+j1
+jn
+kbhit
+lseek
+ltoa
+memccpy
+memicmp
+mkdir
+mktemp
+open
+pclose
+popen
+putch
+putenv
+putw
+read
+rmdir
+searchenv
+seterrormode
+setmode
+sleep
+sopen
+spawnl
+spawnle
+spawnlp
+spawnlpe
+spawnv
+spawnve
+spawnvp
+spawnvpe
+stat
+strcmpi
+strdup
+stricmp
+stricoll
+strlwr
+strnicmp
+strnset
+strrev
+strset
+strupr
+swab
+tell
+tempnam
+
+
+
+; export tzname for both. See <time.h>
+tzname DATA
+tzset
+umask
+ungetch
+unlink
+utime
+wcsdup
+wcsicmp
+wcsicoll
+wcslwr
+wcsnicmp
+wcsnset
+wcsrev
+wcsset
+wcsupr
+
+
+
+write
+y0
+y1
+yn
diff --git a/winsup/mingw/moldname-msvcrt.def b/winsup/mingw/moldname-msvcrt.def
index c341d2e11f7..f6e90755a23 100644
--- a/winsup/mingw/moldname-msvcrt.def
+++ b/winsup/mingw/moldname-msvcrt.def
@@ -1,142 +1,142 @@
-;

-; moldname-msvcrt.def

-;

-; Exports from the runtime except that these exports are actually preceeded

-; by a underscore in the actual DLL. These correspond to functions which

-; are non-ANSI and were prefixed with an underscore to avoid name space

-; clutter. However many, in fact most programs still use a few of these

-; functions without the underscore. This .def file is specially processed

-; to make those non-underscored name function calls call the equivalent

-; underscored functions.

-;

-; Contributors:

-; Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>

-; Maintained by Mumit Khan <khan@xraylith.wisc.edu>

-;

-; THIS SOFTWARE IS NOT COPYRIGHTED

-;

-; This source code is offered for use in the public domain. You may

-; use, modify or distribute it freely.

-;

-; This code is distributed in the hope that it will be useful but

-; WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY

-; DISCLAMED. This includes but is not limited to warrenties of

-; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

-;

-EXPORTS

-access

-beep

-cabs

-chdir

-chmod

-chsize

-close

-creat

-cwait

-

-daylight DATA

-

-dup

-dup2

-ecvt

-eof

-execl

-execle

-execlp

-execlpe

-execv

-execve

-execvp

-execvpe

-fcvt

-fdopen

-fgetchar

-fgetwchar

-filelength

-fileno

-fpreset

-fputchar

-fputwchar

-fstat

-ftime

-gcvt

-getch

-getche

-getcwd

-getpid

-getw

-heapwalk

-hypot

-isatty

-itoa

-j0

-j1

-jn

-kbhit

-lseek

-ltoa

-memccpy

-memicmp

-mkdir

-mktemp

-open

-pclose

-popen

-putch

-putenv

-putw

-read

-rmdir

-searchenv

-seterrormode

-setmode

-sleep

-sopen

-spawnl

-spawnle

-spawnlp

-spawnlpe

-spawnv

-spawnve

-spawnvp

-spawnvpe

-stat

-strcmpi

-strdup

-stricmp

-stricoll

-strlwr

-strnicmp

-strnset

-strrev

-strset

-strupr

-swab

-tell

-tempnam

-

-timezone DATA

-

-; export tzname for both. See <time.h>

-tzname DATA

-tzset

-umask

-ungetch

-unlink

-utime

-wcsdup

-wcsicmp

-wcsicoll

-wcslwr

-wcsnicmp

-wcsnset

-wcsrev

-wcsset

-wcsupr

-

-wpopen

-

-write

-y0

-y1

-yn

+;
+; moldname-msvcrt.def
+;
+; Exports from the runtime except that these exports are actually preceeded
+; by a underscore in the actual DLL. These correspond to functions which
+; are non-ANSI and were prefixed with an underscore to avoid name space
+; clutter. However many, in fact most programs still use a few of these
+; functions without the underscore. This .def file is specially processed
+; to make those non-underscored name function calls call the equivalent
+; underscored functions.
+;
+; Contributors:
+; Created by Colin Peters <colin@bird.fu.is.saga-u.ac.jp>
+; Maintained by Mumit Khan <khan@xraylith.wisc.edu>
+;
+; THIS SOFTWARE IS NOT COPYRIGHTED
+;
+; This source code is offered for use in the public domain. You may
+; use, modify or distribute it freely.
+;
+; This code is distributed in the hope that it will be useful but
+; WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY
+; DISCLAMED. This includes but is not limited to warrenties of
+; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+;
+EXPORTS
+access
+beep
+cabs
+chdir
+chmod
+chsize
+close
+creat
+cwait
+
+daylight DATA
+
+dup
+dup2
+ecvt
+eof
+execl
+execle
+execlp
+execlpe
+execv
+execve
+execvp
+execvpe
+fcvt
+fdopen
+fgetchar
+fgetwchar
+filelength
+fileno
+fpreset
+fputchar
+fputwchar
+fstat
+ftime
+gcvt
+getch
+getche
+getcwd
+getpid
+getw
+heapwalk
+hypot
+isatty
+itoa
+j0
+j1
+jn
+kbhit
+lseek
+ltoa
+memccpy
+memicmp
+mkdir
+mktemp
+open
+pclose
+popen
+putch
+putenv
+putw
+read
+rmdir
+searchenv
+seterrormode
+setmode
+sleep
+sopen
+spawnl
+spawnle
+spawnlp
+spawnlpe
+spawnv
+spawnve
+spawnvp
+spawnvpe
+stat
+strcmpi
+strdup
+stricmp
+stricoll
+strlwr
+strnicmp
+strnset
+strrev
+strset
+strupr
+swab
+tell
+tempnam
+
+timezone DATA
+
+; export tzname for both. See <time.h>
+tzname DATA
+tzset
+umask
+ungetch
+unlink
+utime
+wcsdup
+wcsicmp
+wcsicoll
+wcslwr
+wcsnicmp
+wcsnset
+wcsrev
+wcsset
+wcsupr
+
+wpopen
+
+write
+y0
+y1
+yn