mingw-cvs Mailing List for MinGW - Minimalist GNU for Windows

A native Windows port of the GNU Compiler Collection (GCC)

Brought to you by: cstrauss, earnie, gressett, keithmarshall

mingw-cvs — List for CVS update notification

This list is closed, nobody may subscribe to it.

2000	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (12)
2001	Jan (13)	Feb (2)	Mar (1)	Apr (1)	May	Jun (38)	Jul (10)	Aug (70)	Sep (63)	Oct (61)	Nov (41)	Dec (28)
2002	Jan (43)	Feb (11)	Mar (9)	Apr (2)	May (97)	Jun (94)	Jul (13)	Aug (49)	Sep (41)	Oct (24)	Nov (55)	Dec (126)
2003	Jan (90)	Feb (75)	Mar (32)	Apr (24)	May (54)	Jun (54)	Jul (22)	Aug (4)	Sep (16)	Oct (8)	Nov (6)	Dec (13)
2004	Jan	Feb (17)	Mar (60)	Apr (21)	May (12)	Jun	Jul (13)	Aug	Sep (29)	Oct	Nov	Dec (2)
2005	Jan (22)	Feb (3)	Mar (2)	Apr (13)	May (82)	Jun (18)	Jul (30)	Aug (17)	Sep (3)	Oct (19)	Nov (4)	Dec (8)
2006	Jan (1)	Feb (6)	Mar (2)	Apr (40)	May	Jun (21)	Jul (1)	Aug (410)	Sep (3)	Oct	Nov (56)	Dec (7)
2007	Jan (19)	Feb	Mar (4)	Apr (8)	May (19)	Jun (6)	Jul (4)	Aug (6)	Sep	Oct (4)	Nov (3)	Dec (2)
2008	Jan (13)	Feb (18)	Mar (12)	Apr	May (2)	Jun	Jul	Aug (1)	Sep	Oct	Nov	Dec
2009	Jan	Feb (6)	Mar (8)	Apr (2)	May (2)	Jun	Jul	Aug (2)	Sep (11)	Oct (13)	Nov (17)	Dec (6)
2010	Jan (24)	Feb (10)	Mar (27)	Apr (20)	May (108)	Jun (8)	Jul (23)	Aug (38)	Sep (49)	Oct (17)	Nov (12)	Dec (14)
2011	Jan (17)	Feb (7)	Mar (28)	Apr (8)	May (20)	Jun (11)	Jul (7)	Aug (12)	Sep (4)	Oct (20)	Nov (19)	Dec (2)
2012	Jan (2)	Feb (6)	Mar (5)	Apr (24)	May (5)	Jun (4)	Jul (6)	Aug (18)	Sep (38)	Oct (26)	Nov (12)	Dec (6)
2013	Jan (19)	Feb (18)	Mar (44)	Apr (35)	May (18)	Jun (21)	Jul (10)	Aug (19)	Sep (44)	Oct (25)	Nov (1)	Dec (2)
2014	Jan (8)	Feb	Mar	Apr (5)	May (1)	Jun (3)	Jul	Aug (3)	Sep	Oct (4)	Nov (4)	Dec (7)
2015	Jan	Feb	Mar (1)	Apr	May (2)	Jun (4)	Jul (6)	Aug (2)	Sep (8)	Oct (2)	Nov (1)	Dec (3)
2016	Jan (7)	Feb (9)	Mar (5)	Apr (5)	May (9)	Jun (4)	Jul (20)	Aug (4)	Sep (7)	Oct (6)	Nov (9)	Dec (2)
2017	Jan (7)	Feb (7)	Mar (5)	Apr	May (1)	Jun (4)	Jul (12)	Aug (4)	Sep (1)	Oct (4)	Nov (11)	Dec (14)
2018	Jan (3)	Feb (3)	Mar	Apr	May	Jun	Jul (2)	Aug	Sep	Oct	Nov	Dec

S	M	T	W	T	F	S
						1
2 (6)	3	4 (3)	5 (2)	6	7 (4)	8 (1)
9 (4)	10 (1)	11 (2)	12 (3)	13 (1)	14	15
16	17 (1)	18 (1)	19 (1)	20 (1)	21 (2)	22
23	24	25	26 (1)	27 (4)	28	29
30

Flat | Threaded

1 2 > >> (Page 1 of 2)

[MinGW-cvs] [git push mingw.org-wsl]Repository: mingw.org-wsl branch redo-filters deleted. 2973c0865fb0f4741edcc51680ce460b8b09a894

From: Earnie B. <no...@so...> - 2012-09-27 16:45:44

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw.org-wsl".

The branch, redo-filters has been deleted
       was  2973c0865fb0f4741edcc51680ce460b8b09a894

-----------------------------------------------------------------------
2973c0865fb0f4741edcc51680ce460b8b09a894 	Make the changes work.
-----------------------------------------------------------------------


hooks/post-receive
-- 
Repository: mingw.org-wsl

[MinGW-cvs] [git push mingw.org-wsl]Repository: mingw.org-wsl branch master updated. e3616ad0fa0a6b509b49a1163b191b124a33ab8f

From: Earnie B. <no...@so...> - 2012-09-27 16:25:36

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw.org-wsl".

The branch, master has been updated
       via  e3616ad0fa0a6b509b49a1163b191b124a33ab8f (commit)
       via  2973c0865fb0f4741edcc51680ce460b8b09a894 (commit)
       via  b6a947ede19da18e2cf8841b1283db350d7e64a6 (commit)
       via  9e7428cac4bfcdbd0018635220f13ea225674fc7 (commit)
       via  66fd95c73404ecd59e84ac01a7b772e33e5e1fff (commit)
       via  f1c055a57560d3ddd06b765e1f958d39550dc64f (commit)
       via  9e9d065666e3e21edb1d04ff08d499049cc5a831 (commit)
       via  73f6ac0c5a3c485b0bcea20e05f06dc9f705bf6c (commit)
       via  686b9d21aa238718dc3c8073a4e768522a3d153d (commit)
       via  9313d16b81162e4d6f58aa5b4a08d16dbcbccdb6 (commit)
       via  e920ae33a2cffba1b99f00246832fd28b6700da7 (commit)
       via  2d50b249b0246eef6e031153215e9f4939d8824c (commit)
       via  4bb2b3ca71ced2f1f72184ca94d4c11c78daa753 (commit)
       via  b6c47e8d8d31d487332e529437462f6ae957201d (commit)
       via  5567112e48461df58aa06fdfed7ca45a0ff450b9 (commit)
       via  13ea88a43dacef1f0474ec453ed142f9644c966c (commit)
       via  89cfda4ffad25974a1b0776b5349004177e701fa (commit)
      from  fd0c88828fac399eb5b703354584b6fdc03b8e93 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw.org-wsl;a=commitdiff;h=

commit e3616ad0fa0a6b509b49a1163b191b124a33ab8f
Author: Earnie Boyd <ea...@us...>
Date:   Thu Sep 27 12:20:06 2012 -0400

    	_USE_32BIT_TIME_T resolution and prepare for release.
    
    	* include/io.h: Add _HAVE_32BIT_TIME_T to filters.
    	* include/sys/stat.h: Ditto.
    	* include/sys/timeb.h: Ditto.
    	* include/sys/types.h: Ditto.
    	* include/wchar.h: Ditto.
    	* include/time.h: Rework _HAVE_32BIT_TIME_T to always use 64bit time_t
    	when not defined.
    	* Makefile.in (extra_OBJECTS): Move to the front of the dependency list.
    	(%.o : %.s): Create rules.
    	* lib/lib32/msvcrt.def.in: Remove needless __MSVCRT_VERSION__ filter
    	and previous endif to continue the previous filter.
    	* NEWS: New file.

diff --git a/ChangeLog b/ChangeLog
index f8839a5..e6e6a4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2012-09-27  Earnie Boyd  <ea...@us...>
+
+	_USE_32BIT_TIME_T resolution and prepare for release.
+
+	* include/io.h: Add _HAVE_32BIT_TIME_T to filters.
+	* include/sys/stat.h: Ditto.
+	* include/sys/timeb.h: Ditto.
+	* include/sys/types.h: Ditto.
+	* include/wchar.h: Ditto.
+	* include/time.h: Rework _HAVE_32BIT_TIME_T to always use 64bit time_t
+	when not defined.
+	* Makefile.in (extra_OBJECTS): Move to the front of the dependency list.
+	(%.o : %.s): Create rules.
+	* lib/lib32/msvcrt.def.in: Remove needless __MSVCRT_VERSION__ filter
+	and previous endif to continue the previous filter.
+	* NEWS: New file.
+
 2012-09-26  Earnie Boyd  <ea...@us...>
 
 	Make the changes work.
diff --git a/Makefile.in b/Makefile.in
index bf7bc01..51c2686 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -621,7 +621,7 @@ ALL_SOURCES := \
   $(libdxerr8_a_SOURCES) \
   $(libdxerr9_a_SOURCES)
 
-all: $(msvcrt_DEF) $(moldname_DEF) $(lib_LIBRARIES) $(bin_LIBRARIES) $(lib_OBJECTS) $(extra_OBJECTS)
+all: $(extra_OBJECTS) $(msvcrt_DEF) $(moldname_DEF) $(lib_LIBRARIES) $(bin_LIBRARIES) $(lib_OBJECTS)
 
 $(msvcrt_DEF): lib/lib32/msvcrt.def.in
 	N=`echo $@ | sed -e 's|\([a-z]*\)\([0-9]*\).*|\1|'`; \
@@ -711,6 +711,10 @@ lib%.a: src/lib%/%.o
 	$(MKDIR_P) $(@D)
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
+%.o : %.s
+	$(MKDIR_P) $(@D)
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
+
 SRCDIR := src/libcrt/crt
 $(SRCDIR)/crt2.o $(SRCDIR)/dllcrt2.o:
 	$(MKDIR_P) $(@D)
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..9999619
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,134 @@
+mingwrt-4.0
+w32api-4.0
+-----
+We have combined the source libraries for winsup/mingw and winsup/w32api into
+our own repository named mingw.org-wsl.  This change allows us to maintain our
+repositories locally and provide the MinGW users a better maintenance plan.
+
+We have a new license for all files that fell into public domain originally. The
+license is now MIT style and is embedded at the top of all files where we were
+able to apply our own license to the file.  Files not containing this new
+license are stored in the misc directory in the repository.  The move of the
+repository files does not change the location of the distributed files.
+
+All include files now include the _mingw.h file in order to make use of some new
+macros as explained later.
+
+All filters for OS version now check only _WIN32_WINNT and use a named macro as
+defined in the new file include/sdkddkver.h and the filters were moved to the
+end of the file if possible to reduce the noise caused by the filter.
+
+A new macro named __AW() and defined in _mingw.h is used to suffix a symbol with
+the UNICODE versus ANSI A or W declarations and definitions.  This reduced the
+number of lines in an include file by significant amounts dependent on the
+number of symbols which are specific to ANSI versus UNICODE.
+
+File include/w32api.h is deprecated and you will receive a warning telling you
+to not use the file.
+
+You should now always define NTDDI_VERSION with the least OS version you wish
+your application to support.  We determine a default based on the _WIN32_WINNT
+value suffixed with 0000 (service pack 0).  If _WIN32_WINNT is not defined we
+determine a default for it based on WINVER if it is defined or
+_WIN32_WINNT_WIN2K.  If NTDDI_VERSION is defined then _WIN32_WINNT is checked
+for a match if defined and give an error if they do not match.  If NTDDI_VERSION
+is defined but _WIN32_WINNT not defined _WIN32_WINNT takes on the
+OSDIR(NTDDI_VERSION) value.  The windows.h header file will include sdkddkver.h
+but you may need to specify the include in your source.
+
+CRTDLL is no longer supported.  We have removed the creation of the library and
+the filters from the code.  This also removes startup object files that you
+would have had to specify to the linker.  The GCC specs file is already not
+supporting CRTDLL; I do not know when this was removed.
+
+All occurances of __MSVCRT_VERSION__ filters were removed as unneeded.  This
+results in the fact that if you do not specify an appropriate -lmsvcr?? library
+where ?? represents the library version number and you use a symbol that is
+only available in a versioned library DLL then you will either receive an error
+during the link step or during runtime.  However, this also removes the
+inconsistency between a Microsoft build and the MinGW build in that you do not
+need to define __MSVCRT_VERSION__ correctly.
+
+We now assume that GCC is the only compiler used with the MinGW.org WSL
+(Windows System Libraries) and that the minimum supported version of GCC is
+3.5.4.  This allowed for futher code refactoring reducing the number of lines
+in a header file.  You will receive an error if a __GNUC__ is not defined or
+if the GCC version isn't 3.5.4.
+
+The build system was revamped in order to take advantage of the combined MinGW
+runtime and w32api source.  We will currently continue to release both the
+mingwrt and the w32api library packages for the time being.  We will eventually
+do away with the dual release packages and have a release under the
+mingw.org-wsl name.
+
+A new macro _HAVE_32BIT_TIME_T can be used if you are needing _USE_32BIT_TIME_T
+and have a library that contains the symbols (e.g. _localtime32).  Otherwise the
+when _USE_32BIT_TIME_T is defined but _HAVE_32BIT_TIME_T the time functions use
+the 64bit time_t functions and type define as appropriate.  This allows you to
+use 32bit time_t with msvcrt.dll but it would be slightly slower.  Note, I
+have discovered that the SysWOW64/msvcrt.dll contains the 32bit time_t functions
+but we do not deliver libmsvcrt.a with these imports as this is not available on
+all systems.  However, you could possibly (needs testing) use the msvcrt.dll
+directly to link against and define _HAVE_32BIT_TIME_T during the compile. 
+
+Issues resolved:
+gdtoa/gd_qnan.h: Make NAN constants positive valued.
+Add MemoryBarrier to libmingwex.a.
+Declare _wexec* and _wspawn* functions in include/process.h.
+Declare _strtoi64, _strtoi64_l, _strtoui64, _strtoui64_l, _wcstrtoi64,
+  _wcstrtoi64_l, _wcstrtoui64, _wcstrtoui64_l in include/stdlib.h.
+Declare _wcstrtoi64, _wcstrtoi64_l, _wcstrtoui64, _wcstrtoui64_l in
+  include/wchar.h.
+Add __STRICT_ANSI__ guard for _getws, _putws, _wfdpen, _wfopen, _wfsopen,
+  _wtmpnam, _wtempnam, _wrename, _wremove, _wperror, _wpopen and PATH_MAX.
+Declare _lock_file and _unlock_file in include/stdio.h.
+When setting default for MAXPATHLEN make sure that PATH_MAX is defined before
+  using it in include/sys/param.h.
+Declare threadlocalinfostruct, threadmbinfostruct, *pthreadlocinfo,
+  *pthreadmbcinfo, _locale_tstruct, and *_locale_t in include/_mingw.h.
+Resolve an issue with tsearch.c.
+Some preparation for _WIN64.
+Performance improvements in libmingwex.a dirent.c code.
+Correct _wfindfirst, _wfindnext, _wfindfirst32, _wfindnext32, _wfindfirsti64
+  _wfindnexti64, _wfindfirst32i64, _wfindfirst64i32, _wfindnext32i64,
+  _wfindnext64i32, _wfindnext64 to use intptr_t in include/io.h.
+Add inline definitions for getc, putc, getchar, putchar, fopen64 and ftello64
+  in include/stdio.h.
+Reapply fix for __dyn_tls_init.
+Handling of errno in mingwex is more POSIX conformant.
+Redefine the structure for dirent and _wdirent to include d_type and be
+  copesetic to Microsoft attributes.
+Declare DIR and _WDIR as opaque data types.
+__dirstream_t and __wdirstream_t are moved to mingwex dirent.c.
+Add MemoryBarrier to include/winnt.h.
+Correct declaration of VerQueryValue[AW] based on MSDN in include/winver.h.
+Correct typos in include/setupapi.h.
+Correct dwItemData definition for tagMENUITMEINFO[AW] in include/winuser.h.
+Add declaration of WTSVirtualChannelClose, WTSVirtualChannelOpen,
+  WTSVirtualChannelOpenEx, WTSVirtualChannelPurgeInput,
+  WTSVirtualChannelPurgeOutput, WTSVirtualChannelQuery, WTSVirtualChannelRead,
+  and WTSVirtualChannelWrite in include/wtsapi32.h.
+Add import symbols WTSVirtualChannelOpenEx@12 to wtsapi32.def.
+Do not deliver amvideo.h and amaudio.h due to incomplete dependencies.
+Add delivery of include/sdkddkver.h.
+Correct OS version guard for GetModuleHandleEx[AW].
+Add delivery of include/shobjidl.h.
+Reorder IP_LOCAL_BINDING definition before IP_ADAPTER_BINDING_INFO.
+Default OS version is now Windows 2000 service pack 0.
+Define JOB_OBJECT_LIMIT_BREAKAWAY_OK, JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK in
+  include/winnt.h.
+Define JOB_OBJECT_BREAKAWAY_OK as JOB_OBJECT_LIMIT_BREAKAWAY_OK and deprecate.
+Define JOB_OBJECT_SILENT_BREAKAWAY as JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK and
+  deprecate.
+Define PROCESS_QUERY_LIMITED_INFORMATION in include/winnt.h.
+Define MAPVK_* in include/winuser.h.
+Resolve typo for IMAGE_DLLCHARACTERISTICS_* in include/winnt.h.
+Deprecate IMAGE_DLL_CHARACTERISTICS_*.
+Define SIO_UDP_CONNRESET in include/winsock2.h.
+Correct GCP_RESULTSW definition in include/wingdi.h.
+Define STACK_SIZE_PARAM_IS_A_RESERVATION in include/winbase.h.
+Removed PACKED macro from incldue/windef.h.
+Replace PACKED in include/wincon.h with __attribute__((packed)).
+Correct PREAD_PROCESS_MEMORY_ROUTINE definition in include/imagehlp.h.
+Define DOMAIN_ALIAS_RID_REMOTE_DESKTOP_USERS in include/winnt.h.
+Some new functions and definitions in include/userenv.h.
diff --git a/include/io.h b/include/io.h
index 4eea4bc..6646a5c 100644
--- a/include/io.h
+++ b/include/io.h
@@ -109,7 +109,7 @@ struct _finddata64i32_t {
 	_fsize_t	size;
 	char		name[FILENAME_MAX];
 };
-#ifdef _USE_32BIT_TIME_T
+#if defined(_USE_32BIT_TIME_T) && defined(_HAVE_32BIT_TIME_T)
 #define _finddata_t _finddata32_t
 #define _finddatai64_t _finddata32i64_t
 #define _findfirst _findfirst32
@@ -164,7 +164,7 @@ struct _wfinddata64i32_t {
 	__int32		size;
 	wchar_t		name[FILENAME_MAX];
 };
-#ifdef _USE_32BIT_TIME_T
+#if defined(_USE_32BIT_TIME_T) && defined(_HAVE_32BIT_TIME_T)
 #define _wfinddata_t _wfinddata32_t
 #define _wfinddatai64_t _wfinddata32i64_t
 #define _wfindfirst _wfindfirst32
diff --git a/include/sys/stat.h b/include/sys/stat.h
index 7d7f5ca..c621feb 100644
--- a/include/sys/stat.h
+++ b/include/sys/stat.h
@@ -166,7 +166,7 @@ struct _stat64i32 {
 };
 
 #define __stat64 _stat64
-#ifdef _USE_32BIT_TIME_T
+#if defined(_USE_32BIT_TIME_T) && defined(_HAVE_32BIT_TIME_T)
 #define _fstat      _fstat32
 #define _fstati64   _fstat32i64
 #define _stat       _stat32
@@ -242,7 +242,7 @@ int __cdecl __MINGW_NOTHROW _fstat64i32 (int, struct _stat64i32*);
 #endif
 
 #if !defined(_NO_OLDNAMES) && !defined(__STRICT_ANSI__)
-#ifdef _USE_32BIT_TIME_T
+#if defined(_USE_32BIT_TIME_T) && defined(_HAVE_32BIT_TIME_T)
 #define stat(a,b) _stat32(a,b)
 #define fstat(a,b) _fstat32(a,b)
 #else
@@ -284,7 +284,7 @@ int __cdecl __MINGW_NOTHROW _wstat64i32 (const wchar_t*, struct _stat64i32*);
 #define _wstat64i32 _wstat64
 #endif
 
-#ifdef _USE_32BIT_TIME_T
+#if defined(_USE_32BIT_TIME_T) && defined(_HAVE_32BIT_TIME_T)
 #define _wstat      _wstat32
 #define _wstati64   _wstat32i64
 #else /* !_USE_32BIT_TIME_T */
diff --git a/include/sys/timeb.h b/include/sys/timeb.h
index d1bd95e..b55d1f8 100644
--- a/include/sys/timeb.h
+++ b/include/sys/timeb.h
@@ -93,11 +93,11 @@ _CRTIMP void __cdecl __MINGW_NOTHROW	_ftime64 (struct __timeb64*);
 
 _CRTIMP void __cdecl __MINGW_NOTHROW	_ftime32 (struct __timeb32*);
 
-#ifndef _USE_32BIT_TIME_T
-_CRTALIAS void __cdecl __MINGW_NOTHROW	_ftime (struct _timeb* _v) { return(_ftime64 ((struct __timeb64*)_v)); }
+#if defined(_USE_32BIT_TIME_T) && defined(_HAVE_32BIT_TIME_T)
+_CRTALIAS void __cdecl __MINGW_NOTHROW	_ftime (struct _timeb* _v) { return(_ftime32 ((struct __timeb32*)_v)); }
 #else
 
-_CRTALIAS void __cdecl __MINGW_NOTHROW	_ftime (struct _timeb* _v) { return(_ftime32 ((struct __timeb32*)_v)); }
+_CRTALIAS void __cdecl __MINGW_NOTHROW	_ftime (struct _timeb* _v) { return(_ftime64 ((struct __timeb64*)_v)); }
 #endif
 
 #ifdef	__cplusplus
diff --git a/include/sys/types.h b/include/sys/types.h
index d8ec1c0..4a5d972 100644
--- a/include/sys/types.h
+++ b/include/sys/types.h
@@ -48,12 +48,12 @@ typedef __int64 __time64_t;
 #ifndef _TIME_T_DEFINED
 /* FIXME __STRICT_ANSI__ ! */
 
-#ifndef _USE_32BIT_TIME_T
-typedef	__time64_t time_t;
+#if defined(_USE_32BIT_TIME_T) && defined(_HAVE_32BIT_TIME_T)
+typedef	__time32_t time_t;
 #else
 
-typedef	__time32_t time_t;
-#endif /* !_USE_32BIT_TIME_T */
+typedef	__time64_t time_t;
+#endif /* _USE_32BIT_TIME_T */
 
 #define _TIME_T_DEFINED
 #endif
diff --git a/include/time.h b/include/time.h
index c45e5ba..682a6ce 100644
--- a/include/time.h
+++ b/include/time.h
@@ -61,11 +61,11 @@ typedef __int64 __time64_t;
 #endif
 
 #ifndef _TIME_T_DEFINED
-# ifndef _USE_32BIT_TIME_T
-   typedef	__time64_t time_t;
-# else
+# if defined(_USE_32BIT_TIME_T) && defined(_HAVE_32BIT_TIME_T)
    typedef	__time32_t time_t;
-# endif /* !_USE_32BIT_TIME_T */
+# else
+   typedef	__time64_t time_t;
+# endif /* _USE_32BIT_TIME_T */
 # define _TIME_T_DEFINED
 #endif
 
@@ -153,16 +153,7 @@ _CRTIMP char*	   __cdecl __MINGW_NOTHROW	_ctime32 (const __time32_t*);
 _CRTIMP struct tm* __cdecl __MINGW_NOTHROW	_gmtime32 (const __time32_t*);
 _CRTIMP struct tm* __cdecl __MINGW_NOTHROW	_localtime32 (const __time32_t*);
 
-#ifndef _USE_32BIT_TIME_T
-_CRTALIAS time_t	   __cdecl __MINGW_NOTHROW	time (time_t* _v)		  { return(_time64 (_v)); }
-_CRTALIAS double	   __cdecl __MINGW_NOTHROW	difftime (time_t _v1, time_t _v2) { return(_difftime64 (_v1,_v2)); }
-_CRTALIAS time_t	   __cdecl __MINGW_NOTHROW	mktime (struct tm* _v)		  { return(_mktime64 (_v)); }
-_CRTALIAS time_t	   __cdecl __MINGW_NOTHROW	_mkgmtime (struct tm* _v)	  { return(_mkgmtime64 (_v)); }
-_CRTALIAS char*		   __cdecl __MINGW_NOTHROW	ctime (const time_t* _v)	  { return(_ctime64 (_v)); }
-_CRTALIAS struct tm*	   __cdecl __MINGW_NOTHROW	gmtime (const time_t* _v)	  { return(_gmtime64 (_v)); }
-_CRTALIAS struct tm*	   __cdecl __MINGW_NOTHROW	localtime (const time_t* _v)	  { return(_localtime64 (_v)); }
-#else
-#ifdef _HAVE_32BIT_TIME_T
+#if defined(_USE_32BIT_TIME_T) && defined(_HAVE_32BIT_TIME_T)
 _CRTALIAS time_t	   __cdecl __MINGW_NOTHROW	time (time_t* _v)		  { return(_time32 (_v)); }
 _CRTALIAS double	   __cdecl __MINGW_NOTHROW	difftime (time_t _v1, time_t _v2) { return(_difftime32 (_v1,_v2)); }
 _CRTALIAS time_t	   __cdecl __MINGW_NOTHROW	mktime (struct tm* _v)		  { return(_mktime32 (_v)); }
@@ -171,15 +162,14 @@ _CRTALIAS char*		   __cdecl __MINGW_NOTHROW	ctime (const time_t* _v)	  { return(
 _CRTALIAS struct tm*	   __cdecl __MINGW_NOTHROW	gmtime (const time_t* _v)	  { return(_gmtime32 (_v)); }
 _CRTALIAS struct tm*	   __cdecl __MINGW_NOTHROW	localtime (const time_t* _v)	  { return(_localtime32 (_v)); }
 #else
-_CRTALIAS time_t	   __cdecl __MINGW_NOTHROW	time (time_t* _v)		  { return((__time32_t)_time64 ((__time64_t)_v)); }
-_CRTALIAS double	   __cdecl __MINGW_NOTHROW	difftime (time_t _v1, time_t _v2) { return(_difftime64 ((__time64_t)_v1,(__time64_t)_v2)); }
-_CRTALIAS time_t	   __cdecl __MINGW_NOTHROW	mktime (struct tm* _v)		  { return((__time32_t)_mktime64 (_v)); }
-_CRTALIAS time_t	   __cdecl __MINGW_NOTHROW	_mkgmtime (struct tm* _v)	  { return((__time32_t)_mkgmtime64 (_v)); }
-_CRTALIAS char*		   __cdecl __MINGW_NOTHROW	ctime (const time_t* _v)	  { return(_ctime64 ((__time64_t)_v)); }
-_CRTALIAS struct tm*	   __cdecl __MINGW_NOTHROW	gmtime (const time_t* _v)	  { return(_gmtime64 ((__time64_t)_v)); }
-_CRTALIAS struct tm*	   __cdecl __MINGW_NOTHROW	localtime (const time_t* _v)	  { return(_localtime64 ((__time64_t)_v)); }
-#endif /* _HAVE_32BIT_TIME_T */
-#endif /* !_USE_32BIT_TIME_T */
+_CRTALIAS time_t	   __cdecl __MINGW_NOTHROW	time (time_t* _v)		  { return(_time64 (_v)); }
+_CRTALIAS double	   __cdecl __MINGW_NOTHROW	difftime (time_t _v1, time_t _v2) { return(_difftime64 (_v1,_v2)); }
+_CRTALIAS time_t	   __cdecl __MINGW_NOTHROW	mktime (struct tm* _v)		  { return(_mktime64 (_v)); }
+_CRTALIAS time_t	   __cdecl __MINGW_NOTHROW	_mkgmtime (struct tm* _v)	  { return(_mkgmtime64 (_v)); }
+_CRTALIAS char*		   __cdecl __MINGW_NOTHROW	ctime (const time_t* _v)	  { return(_ctime64 (_v)); }
+_CRTALIAS struct tm*	   __cdecl __MINGW_NOTHROW	gmtime (const time_t* _v)	  { return(_gmtime64 (_v)); }
+_CRTALIAS struct tm*	   __cdecl __MINGW_NOTHROW	localtime (const time_t* _v)	  { return(_localtime64 (_v)); }
+#endif /* _USE_32BIT_TIME_T */
 
 /*
  * _daylight: non zero if daylight savings time is used.
diff --git a/include/wchar.h b/include/wchar.h
index 87cf639..06ef496 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -200,11 +200,11 @@ _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW	_wstrtime (wchar_t*);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW	_wctime64 (const __time64_t*);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW	_wctime32 (const __time32_t*);
 
-#ifndef _USE_32BIT_TIME_T
-_CRTALIAS wchar_t* __cdecl __MINGW_NOTHROW	_wctime (const time_t* _v)	{ return(_wctime64 (_v)); }
+#if defined(_USE_32BIT_TIME_T) && defined(_HAVE_32BIT_TIME_T)
+_CRTALIAS wchar_t* __cdecl __MINGW_NOTHROW	_wctime (const time_t* _v)	{ return(_wctime32 (_v)); }
 #else
 
-_CRTALIAS wchar_t* __cdecl __MINGW_NOTHROW	_wctime (const time_t* _v)	{ return(_wctime32 (_v)); }
+_CRTALIAS wchar_t* __cdecl __MINGW_NOTHROW	_wctime (const time_t* _v)	{ return(_wctime64 (_v)); }
 #endif
 
 #endif /* __STRICT_ANSI__ */
@@ -417,16 +417,17 @@ _CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wfindnext64(intptr_t, struct __wfindda
 _CRTIMP long __cdecl __MINGW_NOTHROW	_wfindfirst32 (const wchar_t*, struct __wfinddata32_t*);
 _CRTIMP int  __cdecl __MINGW_NOTHROW	_wfindnext32 (long, struct __wfinddata32_t*);
 
-#ifndef _USE_32BIT_TIME_T
-_CRTALIAS long __cdecl __MINGW_NOTHROW	_wfindfirst (const wchar_t* _v1, struct _wfinddata_t* _v2)	 { return(_wfindfirst64i32 (_v1,(struct _wfinddata64i32_t*)_v2)); }
-_CRTALIAS int  __cdecl __MINGW_NOTHROW	_wfindnext (long _v1, struct _wfinddata_t* _v2)			 { return(_wfindnext64i32  (_v1,(struct _wfinddata64i32_t*)_v2)); }
-_CRTALIAS long __cdecl __MINGW_NOTHROW	_wfindfirsti64 (const wchar_t* _v1, struct _wfinddatai64_t* _v2) { return(_wfindfirst64 (_v1,(struct __wfinddata64_t*)_v2)); }
-_CRTALIAS int  __cdecl __MINGW_NOTHROW	_wfindnexti64 (long _v1, struct _wfinddatai64_t* _v2)		 { return(_wfindnext64  (_v1,(struct __wfinddata64_t*)_v2)); }
-#else
+#if defined(_USE_32BIT_TIME_T) && defined(_HAVE_32BIT_TIME_T)
 _CRTALIAS long __cdecl __MINGW_NOTHROW	_wfindfirst (const wchar_t* _v1, struct _wfinddata_t* _v2)	 { return(_wfindfirst32 (_v1,(struct __wfinddata32_t*)_v2)); }
 _CRTALIAS int  __cdecl __MINGW_NOTHROW	_wfindnext (long _v1, struct _wfinddata_t* _v2)			 { return(_wfindnext32  (_v1,(struct __wfinddata32_t*)_v2)); }
 _CRTALIAS long __cdecl __MINGW_NOTHROW	_wfindfirsti64 (const wchar_t* _v1, struct _wfinddatai64_t* _v2) { return(_wfindfirst32i64 (_v1,(struct _wfinddata32i64_t*)_v2)); }
 _CRTALIAS int  __cdecl __MINGW_NOTHROW	_wfindnexti64 (long _v1, struct _wfinddatai64_t* _v2)		 { return(_wfindnext32i64  (_v1,(struct _wfinddata32i64_t*)_v2)); }
+#else
+
+_CRTALIAS long __cdecl __MINGW_NOTHROW	_wfindfirst (const wchar_t* _v1, struct _wfinddata_t* _v2)	 { return(_wfindfirst64i32 (_v1,(struct _wfinddata64i32_t*)_v2)); }
+_CRTALIAS int  __cdecl __MINGW_NOTHROW	_wfindnext (long _v1, struct _wfinddata_t* _v2)			 { return(_wfindnext64i32  (_v1,(struct _wfinddata64i32_t*)_v2)); }
+_CRTALIAS long __cdecl __MINGW_NOTHROW	_wfindfirsti64 (const wchar_t* _v1, struct _wfinddatai64_t* _v2) { return(_wfindfirst64 (_v1,(struct __wfinddata64_t*)_v2)); }
+_CRTALIAS int  __cdecl __MINGW_NOTHROW	_wfindnexti64 (long _v1, struct _wfinddatai64_t* _v2)		 { return(_wfindnext64  (_v1,(struct __wfinddata64_t*)_v2)); }
 #endif /* !_USE_32BIT_TIME_T*/
 
 #define _WIO_DEFINED
@@ -522,7 +523,7 @@ struct _stat64i32 {
 };
 
 #define __stat64 _stat64
-#ifdef _USE_32BIT_TIME_T
+#if defined(_USE_32BIT_TIME_T) && defined(_HAVE_32BIT_TIME_T)
 #define _fstat      _fstat32
 #define _fstati64   _fstat32i64
 #define _stat       _stat32
@@ -567,14 +568,14 @@ int __cdecl __MINGW_NOTHROW _wstat64i32 (const wchar_t*, struct _stat64i32*);
 #define _wstat64i32 _wstat64
 #endif
 
-#ifdef _USE_32BIT_TIME_T
+#if defined(_USE_32BIT_TIME_T) && defined(_HAVE_32BIT_TIME_T)
 #define _wstat      _wstat32
 #define _wstati64   _wstat32i64
 #else
 
 #define _wstat      _wstat64i32
 #define _wstati64   _wstat64
-#endif /* !_USE_32BIT_TIME_T */
+#endif /* _USE_32BIT_TIME_T */
 
 #define _WSTAT_DEFINED
 #endif /* _WSTAT_DEFIND */
diff --git a/lib/lib32/msvcrt.def.in b/lib/lib32/msvcrt.def.in
index 1b2336d..79bc312 100644
--- a/lib/lib32/msvcrt.def.in
+++ b/lib/lib32/msvcrt.def.in
@@ -851,8 +851,6 @@ _fseeki64
 _ftelli64
 _fseeki64_nolock
 _ftelli64_nolock
-#endif /* 8.0 */
-#if __MSVCRT_VERSION__ >= 0x0800
 _ctime32
 _difftime32
 _difftime64

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                |  819 ++++++++
 Makefile.in                              |   62 +-
 NEWS                                     |  134 ++
 NOTES                                    |    4 +
 TODO                                     |   77 +
 include/_mingw.h                         |   65 +-
 include/accctrl.h                        |   56 +-
 include/aclapi.h                         |   73 +-
 include/aclui.h                          |    1 +
 include/adsprop.h                        |   25 +-
 include/afxres.h                         |    1 +
 include/amaudio.h                        |    1 +
 include/amvideo.h                        |    1 +
 include/audevcod.h                       |    1 +
 include/aviriff.h                        |    1 +
 include/aygshell.h                       |    1 +
 include/basetsd.h                        |    1 +
 include/basetyps.h                       |    1 +
 include/bdatypes.h                       |    1 +
 include/cderr.h                          |    1 +
 include/cguid.h                          |    1 +
 include/cmnquery.h                       |    5 +-
 include/comcat.h                         |    1 +
 include/commctrl.h                       | 2983 +++++++++++++-----------------
 include/commdlg.h                        |  158 +-
 include/complex.h                        |    7 -
 include/conio.h                          |    4 +-
 include/control.h                        |    1 +
 include/cpl.h                            |   13 +-
 include/cplext.h                         |    1 +
 include/ctype.h                          |   20 +-
 include/custcntl.h                       |   24 +-
 include/dbt.h                            |   39 +-
 include/dde.h                            |    1 +
 include/ddeml.h                          |   38 +-
 include/ddk/atm.h                        |    1 +
 include/ddk/batclass.h                   |    1 +
 include/ddk/cfg.h                        |    8 +-
 include/ddk/cfgmgr32.h                   |  109 +-
 include/ddk/d4drvif.h                    |    8 +-
 include/ddk/d4iface.h                    |    1 +
 include/ddk/ddkmapi.h                    |    8 +-
 include/ddk/hidclass.h                   |    1 +
 include/ddk/hidpi.h                      |    8 +-
 include/ddk/hidsdi.h                     |    1 +
 include/ddk/hidusage.h                   |    1 +
 include/ddk/kbdmou.h                     |    7 +-
 include/ddk/mcd.h                        |    8 +-
 include/ddk/miniport.h                   |    8 +-
 include/ddk/minitape.h                   |    2 +
 include/ddk/mountdev.h                   |    8 +-
 include/ddk/mountmgr.h                   |    1 +
 include/ddk/ndis.h                       |    7 +-
 include/ddk/ndisguid.h                   |    8 +-
 include/ddk/ndistapi.h                   |   25 +-
 include/ddk/ndiswan.h                    |    8 +-
 include/ddk/netevent.h                   |    1 +
 include/ddk/netpnp.h                     |    8 +-
 include/ddk/newdev.h                     |   14 +-
 include/ddk/ntapi.h                      |    8 +-
 include/ddk/ntdd8042.h                   |    8 +-
 include/ddk/ntddbeep.h                   |    8 +-
 include/ddk/ntddcdrm.h                   |    8 +-
 include/ddk/ntddcdvd.h                   |    8 +-
 include/ddk/ntddchgr.h                   |    8 +-
 include/ddk/ntdddisk.h                   |    8 +-
 include/ddk/ntddk.h                      |    8 +-
 include/ddk/ntddkbd.h                    |    8 +-
 include/ddk/ntddmou.h                    |    8 +-
 include/ddk/ntddndis.h                   |    8 +-
 include/ddk/ntddpar.h                    |    8 +-
 include/ddk/ntddpcm.h                    |    8 +-
 include/ddk/ntddscsi.h                   |    8 +-
 include/ddk/ntddser.h                    |    8 +-
 include/ddk/ntddstor.h                   |    8 +-
 include/ddk/ntddtape.h                   |    8 +-
 include/ddk/ntddtdi.h                    |    8 +-
 include/ddk/ntddvdeo.h                   |    8 +-
 include/ddk/ntddvol.h                    |    8 +-
 include/ddk/ntifs.h                      |   10 +-
 include/ddk/ntpoapi.h                    |    8 +-
 include/ddk/ntstatus.h                   |    9 +-
 include/ddk/parallel.h                   |    8 +-
 include/ddk/pfhook.h                     |    8 +-
 include/ddk/poclass.h                    |    8 +-
 include/ddk/scsi.h                       |    8 +-
 include/ddk/scsiscan.h                   |    8 +-
 include/ddk/scsiwmi.h                    |    8 +-
 include/ddk/smbus.h                      |    8 +-
 include/ddk/srb.h                        |    8 +-
 include/ddk/storport.h                   |    1 +
 include/ddk/tdi.h                        |    8 +-
 include/ddk/tdiinfo.h                    |    8 +-
 include/ddk/tdikrnl.h                    |    8 +-
 include/ddk/tdistat.h                    |    8 +-
 include/ddk/tvout.h                      |    8 +-
 include/ddk/upssvc.h                     |    8 +-
 include/ddk/usb.h                        |    1 +
 include/ddk/usb100.h                     |    8 +-
 include/ddk/usbcamdi.h                   |    8 +-
 include/ddk/usbdi.h                      |    8 +-
 include/ddk/usbioctl.h                   |    8 +-
 include/ddk/usbiodef.h                   |    8 +-
 include/ddk/usbscan.h                    |    8 +-
 include/ddk/usbuser.h                    |   10 +-
 include/ddk/video.h                      |    8 +-
 include/ddk/videoagp.h                   |    8 +-
 include/ddk/win2k.h                      |    8 +-
 include/ddk/winddi.h                     |    8 +-
 include/ddk/winddk.h                     |   11 +-
 include/ddk/winnt4.h                     |    8 +-
 include/ddk/winxp.h                      |    8 +-
 include/ddk/ws2san.h                     |    8 +-
 include/ddk/xfilter.h                    |    8 +-
 include/devguid.h                        |    1 +
 include/dhcpcsdk.h                       |    5 +-
 include/direct.h                         |    2 -
 include/directx/d3d9.h                   |    6 +-
 include/directx/d3d9caps.h               |    4 +-
 include/directx/d3d9types.h              |    4 +-
 include/directx/dxerr8.h                 |   14 +-
 include/directx/dxerr9.h                 |   14 +-
 include/dirent.h                         |    2 -
 include/dlgs.h                           |    1 +
 include/docobj.h                         |    1 +
 include/dos.h                            |    4 +-
 include/dsadmin.h                        |    5 +-
 include/dsclient.h                       |   20 +-
 include/dsgetdc.h                        |   17 +-
 include/dshow.h                          |    1 +
 include/dsquery.h                        |    5 +-
 include/dsrole.h                         |    5 +-
 include/dvdevcod.h                       |    1 +
 include/dvdmedia.h                       |    1 +
 include/edevdefs.h                       |    1 +
 include/errno.h                          |    4 +-
 include/errorrep.h                       |   14 +-
 include/errors.h                         |    7 +-
 include/evcode.h                         |    1 +
 include/excpt.h                          |    4 +-
 include/exdisp.h                         |    1 +
 include/exdispid.h                       |    1 +
 include/fcntl.h                          |   16 +-
 include/fenv.h                           |    1 -
 include/float.h                          |    4 +-
 include/fltdefs.h                        |    5 +-
 include/gdiplus/gdiplus.h                |    1 +
 include/gdiplus/gdiplusbase.h            |    8 +-
 include/gdiplus/gdiplusbrush.h           |    8 +-
 include/gdiplus/gdipluscolor.h           |    8 +-
 include/gdiplus/gdipluscolormatrix.h     |    8 +-
 include/gdiplus/gdipluseffects.h         |    8 +-
 include/gdiplus/gdiplusenums.h           |    8 +-
 include/gdiplus/gdiplusflat.h            |   14 +-
 include/gdiplus/gdiplusgpstubs.h         |    8 +-
 include/gdiplus/gdiplusgraphics.h        |    8 +-
 include/gdiplus/gdiplusheaders.h         |    8 +-
 include/gdiplus/gdiplusimageattributes.h |    8 +-
 include/gdiplus/gdiplusimagecodec.h      |    8 +-
 include/gdiplus/gdiplusimaging.h         |    8 +-
 include/gdiplus/gdiplusimpl.h            |    8 +-
 include/gdiplus/gdiplusinit.h            |    8 +-
 include/gdiplus/gdipluslinecaps.h        |    8 +-
 include/gdiplus/gdiplusmatrix.h          |    8 +-
 include/gdiplus/gdiplusmem.h             |    8 +-
 include/gdiplus/gdiplusmetafile.h        |    8 +-
 include/gdiplus/gdiplusmetaheader.h      |    9 +-
 include/gdiplus/gdipluspath.h            |    8 +-
 include/gdiplus/gdipluspen.h             |    8 +-
 include/gdiplus/gdipluspixelformats.h    |    8 +-
 include/gdiplus/gdiplusstringformat.h    |    8 +-
 include/gdiplus/gdiplustypes.h           |    8 +-
 include/getopt.h                         |    4 +-
 include/httpext.h                        |    1 +
 include/icm.h                            |   59 +-
 include/idispids.h                       |    1 +
 include/il21dec.h                        |    1 +
 include/imagehlp.h                       |    7 +-
 include/imm.h                            |   84 +-
 include/initguid.h                       |    3 +
 include/intshcut.h                       |   17 +-
 include/inttypes.h                       |    2 +-
 include/io.h                             |  185 +--
 include/ipexport.h                       |    1 +
 include/iphlpapi.h                       |   29 +-
 include/ipifcons.h                       |    1 +
 include/ipinfoid.h                       |    1 +
 include/iprtrmib.h                       |    1 +
 include/iptypes.h                        |   27 +-
 include/ipxconst.h                       |    5 +-
 include/ipxrtdef.h                       |    4 +-
 include/ipxtfflt.h                       |   24 +-
 include/isguids.h                        |    4 +
 include/ks.h                             |    1 +
 include/ksmedia.h                        |    1 +
 include/largeint.h                       |    7 +-
 include/libgen.h                         |    4 +-
 include/limits.h                         |   28 +-
 include/lm.h                             |    1 +
 include/lmaccess.h                       |    1 +
 include/lmalert.h                        |    5 +
 include/lmapibuf.h                       |    4 +
 include/lmat.h                           |    4 +
 include/lmaudit.h                        |    4 +
 include/lmbrowsr.h                       |    4 +
 include/lmchdev.h                        |    4 +
 include/lmconfig.h                       |    4 +
 include/lmcons.h                         |    3 +-
 include/lmerr.h                          |    1 +
 include/lmerrlog.h                       |    4 +
 include/lmmsg.h                          |    4 +
 include/lmremutl.h                       |    4 +
 include/lmrepl.h                         |    4 +
 include/lmserver.h                       |    4 +
 include/lmshare.h                        |    4 +
 include/lmsname.h                        |    2 +
 include/lmstats.h                        |    4 +
 include/lmsvc.h                          |    4 +
 include/lmuse.h                          |    4 +
 include/lmuseflg.h                       |    2 +
 include/lmwksta.h                        |    3 +
 include/locale.h                         |    4 +-
 include/lzexpand.h                       |   13 +-
 include/malloc.h                         |   11 +-
 include/mapi.h                           |    1 +
 include/math.h                           |   30 -
 include/mbctype.h                        |    6 +-
 include/mbstring.h                       |    4 +-
 include/mciavi.h                         |    1 +
 include/mcx.h                            |    4 +
 include/mem.h                            |    1 +
 include/memory.h                         |    1 +
 include/mgm.h                            |    6 +-
 include/mgmtapi.h                        |   12 +-
 include/mlang.h                          |    5 +-
 include/mmreg.h                          |    4 +-
 include/mmsystem.h                       |  156 +-
 include/mpegtype.h                       |    2 +
 include/mprapi.h                         |  145 +-
 include/mq.h                             |  103 +-
 include/msacm.h                          |   35 +-
 include/mshtml.h                         |    1 +
 include/mswsock.h                        |    1 +
 include/nb30.h                           |    4 +
 include/nddeapi.h                        |   42 +-
 include/nspapi.h                         |   17 +-
 include/ntdef.h                          |    6 +
 include/ntdll.h                          |    1 +
 include/ntdsapi.h                        |   20 +-
 include/ntdsbcli.h                       |   11 +-
 include/ntldap.h                         |    1 +
 include/ntsecapi.h                       |    7 +
 include/ntsecpkg.h                       |    2 +
 include/oaidl.h                          |    6 +
 include/objbase.h                        |    5 +
 include/objfwd.h                         |    4 +
 include/objidl.h                         |    1 +
 include/objsafe.h                        |    2 +
 include/objsel.h                         |    6 +-
 include/ocidl.h                          |    2 +
 include/odbcinst.h                       |   14 +
 include/ole.h                            |    7 +
 include/ole2.h                           |    5 +
 include/ole2ver.h                        |    3 +
 include/oleacc.h                         |   14 +-
 include/oleauto.h                        |    5 +
 include/olectl.h                         |    3 +
 include/olectlid.h                       |    2 +
 include/oledlg.h                         |  212 +--
 include/oleidl.h                         |    2 +
 include/pbt.h                            |    1 +
 include/powrprof.h                       |    1 +
 include/process.h                        |    4 +-
 include/prsht.h                          |   52 +-
 include/psapi.h                          |   33 +-
 include/qedit.h                          |    4 +-
 include/rapi.h                           |    1 +
 include/ras.h                            |  686 +++----
 include/rasdlg.h                         |   23 +-
 include/raserror.h                       |    1 +
 include/rassapi.h                        |    3 +
 include/reason.h                         |    5 +-
 include/regstr.h                         |   10 +
 include/richedit.h                       |   25 +-
 include/richole.h                        |    6 +
 include/routprot.h                       |    6 +-
 include/rpc.h                            |    5 +-
 include/rpcdce.h                         |  118 +-
 include/rpcdce2.h                        |   16 +-
 include/rpcdcep.h                        |   13 +-
 include/rpcndr.h                         |   14 +
 include/rpcnsi.h                         |   68 +-
 include/rpcnsip.h                        |    4 +
 include/rpcnterr.h                       |    2 +
 include/rpcproxy.h                       |   24 +-
 include/rtutils.h                        |   47 +-
 include/schannel.h                       |    1 +
 include/schnlsp.h                        |    2 +-
 include/scrnsave.h                       |    2 +
 include/sddl.h                           |   14 +-
 include/sdkddkver.h                      |   15 +-
 include/search.h                         |    2 -
 include/secext.h                         |   17 +-
 include/security.h                       |    2 +-
 include/servprov.h                       |    2 +
 include/setjmp.h                         |    2 -
 include/setupapi.h                       |  444 ++---
 include/share.h                          |    2 -
 include/shellapi.h                       |   84 +-
 include/shldisp.h                        |    3 +-
 include/shlguid.h                        |   33 +-
 include/shlobj.h                         |  783 ++++-----
 include/shlwapi.h                        |  458 ++---
 include/shobjidl.h                       |    3 +-
 include/signal.h                         |    3 +-
 include/snmp.h                           |    3 +
 include/specstrings.h                    |    2 +-
 include/sql.h                            |   10 +
 include/sqlext.h                         |   14 +
 include/sqltypes.h                       |   21 +
 include/sqlucode.h                       |   11 +
 include/sspi.h                           |   97 +-
 include/stdint.h                         |    2 +-
 include/stdio.h                          |   42 +-
 include/stdlib.h                         |  284 ++--
 include/stm.h                            |    6 +-
 include/string.h                         |   21 +-
 include/strings.h                        |    2 +
 include/strmif.h                         |    2 +
 include/subauth.h                        |    5 +
 include/svcguid.h                        |    2 +
 include/sys/fcntl.h                      |    1 +
 include/sys/file.h                       |    1 +
 include/sys/locking.h                    |    3 +-
 include/sys/param.h                      |    2 +
 include/sys/stat.h                       |  250 ++--
 include/sys/time.h                       |    4 +-
 include/sys/timeb.h                      |   19 +-
 include/sys/types.h                      |   16 +-
 include/sys/unistd.h                     |    4 +-
 include/sys/utime.h                      |   26 +-
 include/tchar.h                          |   40 +-
 include/time.h                           |   66 +-
 include/tlhelp32.h                       |    7 +-
 include/tmschema.h                       |    1 +
 include/unistd.h                         |    1 +
 include/unknwn.h                         |    8 +-
 include/userenv.h                        |   56 +-
 include/usp10.h                          |    3 +
 include/utime.h                          |    1 +
 include/uxtheme.h                        |    6 +-
 include/values.h                         |    1 +
 include/vfw.h                            |  152 +-
 include/vidcap.h                         |    2 +
 include/vmr9.h                           |    2 +
 include/vptype.h                         |    2 +
 include/wchar.h                          |  203 +--
 include/wctype.h                         |   17 +-
 include/winable.h                        |   95 +-
 include/winbase.h                        | 1645 +++++++----------
 include/winber.h                         |    2 +
 include/wincon.h                         |   80 +-
 include/wincrypt.h                       |  308 ++--
 include/windef.h                         |   52 +-
 include/windns.h                         |   22 +-
 include/windows.h                        |   26 +-
 include/windowsx.h                       |    1 +
 include/winerror.h                       |    3 +
 include/wingdi.h                         |  633 +++----
 include/wininet.h                        |  187 +--
 include/winioctl.h                       |    5 +
 include/winldap.h                        |  250 +--
 include/winnetwk.h                       |   94 +-
 include/winnls.h                         |  222 +--
 include/winnt.h                          |  434 +++--
 include/winperf.h                        |    4 +
 include/winreg.h                         |  100 +-
 include/winresrc.h                       |    1 +
 include/winsnmp.h                        |    7 +-
 include/winsock.h                        |   24 +
 include/winsock2.h                       |  164 +-
 include/winspool.h                       |  520 +++---
 include/winsvc.h                         |  100 +-
 include/winuser.h                        | 1937 +++++++++-----------
 include/winver.h                         |   32 +-
 include/ws2spi.h                         |    2 +
 include/ws2tcpip.h                       |   31 +-
 include/wsahelp.h                        |    2 +
 include/wsipx.h                          |    2 +
 include/wsnetbs.h                        |    2 +
 include/wtsapi32.h                       |  190 +--
 include/wtypes.h                         |    9 +
 include/xprtdefs.h                       |    1 +
 include/zmouse.h                         |    1 +
 lib/lib32/msvcrt.def.in                  |    2 -
 tests/Makefile.in                        |    2 +-
 tests/headers/directx.c                  |    1 +
 397 files changed, 8755 insertions(+), 10118 deletions(-)
 create mode 100644 NEWS
 create mode 100644 NOTES
 create mode 100644 TODO


hooks/post-receive
-- 
Repository: mingw.org-wsl

[MinGW-cvs] [git push mingw-get]Repository: mingw-get branch master updated. r0-5-beta-20120426-1-24-gebcbf41

From: Keith M. <no...@so...> - 2012-09-27 08:54:11

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw-get".

The branch, master has been updated
       via  ebcbf416fae07c5425da03d5fb8ae57d7add6fd7 (commit)
      from  369cc076af9e422db173a4d4ce42dd8b79105c62 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw-get;a=commitdiff;h=

commit ebcbf416fae07c5425da03d5fb8ae57d7add6fd7
Author: Keith Marshall <kei...@us...>
Date:   Wed Sep 26 20:37:28 2012 +0100

    Add .hgignore as tracked file.

diff --git a/.hgignore b/.hgignore
new file mode 100644
index 0000000..38586c9
--- /dev/null
+++ b/.hgignore
@@ -0,0 +1,10 @@
+syntax: glob
+CVS/
+.git/
+build/
+autom4te.cache/
+configure
+**.orig
+obj/
+exp/
+.#*
diff --git a/ChangeLog b/ChangeLog
index bbfb799..90249bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-26  Keith Marshall  <kei...@us...>
+
+	Add .hgignore as tracked file.
+
+	* .hgignore: New file.
+
 2012-09-12  Keith Marshall  <kei...@us...>
 
 	Note relocation of m4 when packaging source distribution.
diff --git a/build-aux b/build-aux
deleted file mode 160000
index e29d336..0000000
--- a/build-aux
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e29d336021160ae1dfea0d0c9316b79900d33a70

-----------------------------------------------------------------------

Summary of changes:
 .hgignore |   10 ++++++++++
 ChangeLog |    6 ++++++
 build-aux |    1 -
 3 files changed, 16 insertions(+), 1 deletions(-)
 create mode 100644 .hgignore
 delete mode 160000 build-aux


hooks/post-receive
-- 
Repository: mingw-get

[MinGW-cvs] [git push mingw-get]Repository: mingw-get branch gui-dev updated. r0-5-beta-20120426-1-31-gb9f985d

From: Keith M. <no...@so...> - 2012-09-27 08:54:09

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw-get".

The branch, gui-dev has been updated
       via  b9f985d636f1aff6a71230aed3ab7ed849fbfab2 (commit)
       via  79fbd3a7e9912dee371eaa37058432f08b8fc2a5 (commit)
      from  ac64f870243b2a0f66465e2f9e6c368fecdc0fc7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw-get;a=commitdiff;h=

commit ebcbf416fae07c5425da03d5fb8ae57d7add6fd7
Author: Keith Marshall <kei...@us...>
Date:   Wed Sep 26 20:37:28 2012 +0100

    Add .hgignore as tracked file.

diff --git a/.hgignore b/.hgignore
new file mode 100644
index 0000000..38586c9
--- /dev/null
+++ b/.hgignore
@@ -0,0 +1,10 @@
+syntax: glob
+CVS/
+.git/
+build/
+autom4te.cache/
+configure
+**.orig
+obj/
+exp/
+.#*
diff --git a/ChangeLog b/ChangeLog
index bbfb799..90249bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-26  Keith Marshall  <kei...@us...>
+
+	Add .hgignore as tracked file.
+
+	* .hgignore: New file.
+
 2012-09-12  Keith Marshall  <kei...@us...>
 
 	Note relocation of m4 when packaging source distribution.
diff --git a/build-aux b/build-aux
deleted file mode 160000
index e29d336..0000000
--- a/build-aux
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e29d336021160ae1dfea0d0c9316b79900d33a70

http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw-get;a=commitdiff;h=

commit ebcbf416fae07c5425da03d5fb8ae57d7add6fd7
Author: Keith Marshall <kei...@us...>
Date:   Wed Sep 26 20:37:28 2012 +0100

    Add .hgignore as tracked file.

diff --git a/.hgignore b/.hgignore
new file mode 100644
index 0000000..38586c9
--- /dev/null
+++ b/.hgignore
@@ -0,0 +1,10 @@
+syntax: glob
+CVS/
+.git/
+build/
+autom4te.cache/
+configure
+**.orig
+obj/
+exp/
+.#*
diff --git a/ChangeLog b/ChangeLog
index bbfb799..90249bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-26  Keith Marshall  <kei...@us...>
+
+	Add .hgignore as tracked file.
+
+	* .hgignore: New file.
+
 2012-09-12  Keith Marshall  <kei...@us...>
 
 	Note relocation of m4 when packaging source distribution.
diff --git a/build-aux b/build-aux
deleted file mode 160000
index e29d336..0000000
--- a/build-aux
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e29d336021160ae1dfea0d0c9316b79900d33a70

-----------------------------------------------------------------------

Summary of changes:
 .hgsub                           |    1 +
 .hgsubstate                      |    1 +
 ChangeLog                        |   20 +++++++++++++++++++
 Makefile.in                      |   39 +++++++++++++++++++++++++++++++++----
 configure.ac                     |    2 +-
 version.c.in => src/version.c.in |    9 +++++--
 6 files changed, 63 insertions(+), 9 deletions(-)
 create mode 100644 .hgsub
 create mode 100644 .hgsubstate
 rename version.c.in => src/version.c.in (62%)


hooks/post-receive
-- 
Repository: mingw-get

[MinGW-cvs] [git push mingw.org-wsl]Repository: mingw.org-wsl branch redo-filters updated. 2973c0865fb0f4741edcc51680ce460b8b09a894

From: Earnie B. <no...@so...> - 2012-09-26 15:40:03

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw.org-wsl".

The branch, redo-filters has been updated
       via  2973c0865fb0f4741edcc51680ce460b8b09a894 (commit)
      from  b6a947ede19da18e2cf8841b1283db350d7e64a6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw.org-wsl;a=commitdiff;h=

commit fd0c88828fac399eb5b703354584b6fdc03b8e93
Author: Earnie Boyd <ea...@us...>
Date:   Fri Sep 7 10:36:34 2012 -0400

    	Remove filters for CRTDLL and __MSVCRT__.
    
    	* Makefile.in: Remove -[DU]__MSVCRT__ and -[DU]__CRTDLL__.
    	* crt1.o: Remove CRTDLL specific target.
    	* dllcrt1.o: Ditto.
    	* gcrt1.o: Ditto.
    	* include/assert.h: Modify documentation to remove the use of CRTDLL.
    	* include/setjmp.h: Ditto.
    	* src/libcrt/crt/ofmt_stub.s: Ditto.
    	* include/ctype.h: Ditto.
    	Remove filters for __MSVCRT__ and unneeded #else coding.
    	* include/dirent.h: Ditto.
    	* include/dos.h: Ditto.
    	* include/io.h: Ditto.
    	* include/math.h: Ditto.
    	* include/process.h: Ditto.
    	* include/stdio.h: Ditto.
    	* include/stdlib.h: Ditto.
    	* include/string.h: Ditto.
    	* include/sys/stat.h: Ditto.
    	* include/sys/types.h: Ditto.
    	* include/sys/utime.h: Ditto.
    	* include/tchar.h: Ditto.
    	* include/time.h: Ditto.
    	* include/wchar.h: Ditto.
    	* include/wctype.h: Ditto.
    	* src/libcrt/crt/crt1.c: Ditto.
    	* src/libcrt/crt/init.c: Ditto.
    	* lib/lib32/moldname.def.in: Remove filters for __CRTDLL__.
    	* src/libcrt/tlssup.c: Remove filter for CRTDLL.

diff --git a/ChangeLog b/ChangeLog
index 456f89f..7f5dc47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,38 @@
 2012-09-07  Earnie Boyd  <ea...@us...>
 
+	Remove filters for CRTDLL and __MSVCRT__.
+
+	* Makefile.in: Remove -[DU]__MSVCRT__ and -[DU]__CRTDLL__.
+	* crt1.o: Remove CRTDLL specific target.
+	* dllcrt1.o: Ditto.
+	* gcrt1.o: Ditto.
+	* include/assert.h: Modify documentation to remove the use of CRTDLL.
+	* include/setjmp.h: Ditto.
+	* src/libcrt/crt/ofmt_stub.s: Ditto.
+	* include/ctype.h: Ditto.
+	Remove filters for __MSVCRT__ and unneeded #else coding.
+	* include/dirent.h: Ditto.
+	* include/dos.h: Ditto.
+	* include/io.h: Ditto.
+	* include/math.h: Ditto.
+	* include/process.h: Ditto.
+	* include/stdio.h: Ditto.
+	* include/stdlib.h: Ditto.
+	* include/string.h: Ditto.
+	* include/sys/stat.h: Ditto.
+	* include/sys/types.h: Ditto.
+	* include/sys/utime.h: Ditto.
+	* include/tchar.h: Ditto.
+	* include/time.h: Ditto.
+	* include/wchar.h: Ditto.
+	* include/wctype.h: Ditto.
+	* src/libcrt/crt/crt1.c: Ditto.
+	* src/libcrt/crt/init.c: Ditto.
+	* lib/lib32/moldname.def.in: Remove filters for __CRTDLL__.
+	* src/libcrt/tlssup.c: Remove filter for CRTDLL.
+
+2012-09-07  Earnie Boyd  <ea...@us...>
+
 	Apply LICENSE to all files as appropriate.
 
 	* tests/Makefile.in: Add file preamble.
diff --git a/Makefile.in b/Makefile.in
index 9a8d6e8..d32a229 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -626,7 +626,7 @@ $(msvcrt_DEF): lib/lib32/msvcrt.def.in
 	$(CC) -DRUNTIME=$(basename $(notdir $@)) \
 		-D__FILENAME__=$@ \
 		-D__$(basename $(notdir $@))__=1 \
-		-D__MSVCRT__ -C -E -P -xc-header \
+		-C -E -P -xc-header \
 		$? > $@
 
 
@@ -641,7 +641,7 @@ $(moldname_DEF): lib/lib32/moldname.def.in
 	$(CC) -DRUNTIME=$(basename $(notdir $@)) \
 		-D__FILENAME__=$$F \
 		-D__$(basename $(notdir $@))__=1 \
-		-D__MSVCRT__ -C -E -P -xc-header \
+		-C -E -P -xc-header \
 		$? > $@
 
 SRCDIR := lib/lib32
@@ -693,13 +693,9 @@ lib%.a: %.o
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 SRCDIR := src/libcrt/crt
-$(SRCDIR)/crt1.o $(SRCDIR)/dllcrt1.o:
-	$(MKDIR_P) $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $<
-
 $(SRCDIR)/crt2.o $(SRCDIR)/dllcrt2.o:
 	$(MKDIR_P) $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -D__MSVCRT__ -U__CRTDLL__ -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 $(SRCDIR)/crt1.o: $(SRCDIR)/crt1.c
 $(SRCDIR)/dllcrt1.o: $(SRCDIR)/dllcrt1.c
@@ -716,13 +712,9 @@ $(libscrnsavw_a_OBJECTS): $(libscrnsavw_a_SOURCES)
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $(scrnsavw_o_CFLAGS) -o $@ $<
 
 SRCDIR := misc/gpl/profile
-$(SRCDIR)/gcrt1.o:
-	mkdir -p $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $<
-
 $(SRCDIR)/gcrt2.o:
 	mkdir -p $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -D__MSVCRT__ -U__CRTDLL__ -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 $(SRCDIR)/gcrt1.o $(SRCDIR)/gcrt2.o: $(SRCDIR)/gcrt0.c
 
diff --git a/include/assert.h b/include/assert.h
index 1eddeed..6f9cdd0 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -53,7 +53,7 @@ extern "C" {
 #else /* debugging enabled */
 
 /*
- * CRTDLL nicely supplies a function which does the actual output and
+ * The runtime nicely supplies a function which does the actual output and
  * call to abort.
  */
 _CRTIMP void __cdecl __MINGW_NOTHROW _assert (const char*, const char*, int) __MINGW_ATTRIB_NORETURN;
diff --git a/include/ctype.h b/include/ctype.h
index 28ca1a9..e744a09 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -90,7 +90,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW toupper(int);
 
 /*
  * NOTE: The above are not old name type wrappers, but functions exported
- * explicitly by MSVCRT/CRTDLL. However, underscored versions are also
+ * explicitly by MSVCRT.DLL. However, underscored versions are also
  * exported.
  */
 #ifndef	__STRICT_ANSI__
@@ -105,22 +105,11 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int);
 /* Also defined in stdlib.h */
 #ifndef MB_CUR_MAX
 #ifdef __DECLSPEC_SUPPORTED
-# ifdef __MSVCRT__
-#  define MB_CUR_MAX __mb_cur_max
    __MINGW_IMPORT int __mb_cur_max;
-# else	/* not __MSVCRT */
-#  define MB_CUR_MAX __mb_cur_max_dll
-   __MINGW_IMPORT int __mb_cur_max_dll;
-# endif	/* not __MSVCRT */
-
+#  define MB_CUR_MAX __mb_cur_max
 #else		/* ! __DECLSPEC_SUPPORTED */
-# ifdef __MSVCRT__
    extern int* _imp____mb_cur_max;
 #  define MB_CUR_MAX (*_imp____mb_cur_max)
-# else		/* not __MSVCRT */
-   extern int*  _imp____mb_cur_max_dll;
-#  define MB_CUR_MAX (*_imp____mb_cur_max_dll)
-# endif 	/* not __MSVCRT */
 #endif  	/*  __DECLSPEC_SUPPORTED */
 #endif  /* MB_CUR_MAX */
 
@@ -129,25 +118,15 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int);
 # if __MSVCRT_VERSION__ <= 0x0700
   __MINGW_IMPORT unsigned short _ctype[];
 # endif
-# ifdef __MSVCRT__
   __MINGW_IMPORT unsigned short* _pctype;
-# else /* CRTDLL */
-  __MINGW_IMPORT unsigned short* _pctype_dll;
-# define  _pctype _pctype_dll
-# endif 
 
 #else		/*  __DECLSPEC_SUPPORTED */
 # if __MSVCRT_VERSION__ <= 0x0700
   extern unsigned short** _imp___ctype;
 # define _ctype (*_imp___ctype)
 # endif
-# ifdef __MSVCRT__
   extern unsigned short** _imp___pctype;
 # define _pctype (*_imp___pctype)
-# else /* CRTDLL */
-  extern unsigned short** _imp___pctype_dll;
-# define _pctype (*_imp___pctype_dll)
-# endif /* CRTDLL */
 #endif		/*  __DECLSPEC_SUPPORTED */
 
 /*
diff --git a/include/direct.h b/include/direct.h
index 149b8ed..5c576f5 100644
--- a/include/direct.h
+++ b/include/direct.h
@@ -68,13 +68,11 @@ _CRTIMP unsigned __cdecl __MINGW_NOTHROW _getdiskfree (unsigned, struct _diskfre
 
 #ifndef _WDIRECT_DEFINED
 /* wide character versions. Also in wchar.h */
-#ifdef __MSVCRT__ 
 _CRTIMP int __cdecl __MINGW_NOTHROW _wchdir(const wchar_t*);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetcwd(wchar_t*, int);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetdcwd(int, wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wmkdir(const wchar_t*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wrmdir(const wchar_t*);
-#endif	/* __MSVCRT__ */
 #define _WDIRECT_DEFINED
 #endif
 
diff --git a/include/dos.h b/include/dos.h
index 25d06d4..e2c629f 100644
--- a/include/dos.h
+++ b/include/dos.h
@@ -46,41 +46,6 @@
 extern "C" {
 #endif
 
-#ifndef __MSVCRT__ /* these are in CRTDLL, but not MSVCRT */
-#ifndef __DECLSPEC_SUPPORTED
-extern unsigned int *_imp___basemajor_dll;
-extern unsigned int *_imp___baseminor_dll;
-extern unsigned int *_imp___baseversion_dll;
-extern unsigned int *_imp___osmajor_dll;
-extern unsigned int *_imp___osminor_dll;
-extern unsigned int *_imp___osmode_dll;
-
-#define _basemajor (*_imp___basemajor_dll)
-#define _baseminor (*_imp___baseminor_dll)
-#define _baseversion (*_imp___baseversion_dll)
-#define _osmajor (*_imp___osmajor_dll)
-#define _osminor (*_imp___osminor_dll)
-#define _osmode (*_imp___osmode_dll)
-
-#else /* __DECLSPEC_SUPPORTED */
-
-__MINGW_IMPORT unsi

[MinGW-cvs] [git push mingw-get]Repository: mingw-get branch gui-dev created. r0-5-beta-20120426-1-29-gac64f87

From: Keith M. <no...@so...> - 2012-09-21 21:48:39

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw-get".

The branch, gui-dev has been created
        at  ac64f870243b2a0f66465e2f9e6c368fecdc0fc7 (commit)

- Log -----------------------------------------------------------------
http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw-get;a=commitdiff;h=

commit 369cc076af9e422db173a4d4ce42dd8b79105c62
Author: Keith Marshall <kei...@us...>
Date:   Mon Sep 17 21:27:47 2012 +0100

    Reinstate lost build-aux submodule yet again!

diff --git a/build-aux b/build-aux
new file mode 160000
index 0000000..e29d336
--- /dev/null
+++ b/build-aux
@@ -0,0 +1 @@
+Subproject commit e29d336021160ae1dfea0d0c9316b79900d33a70

http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw-get;a=commitdiff;h=

commit 369cc076af9e422db173a4d4ce42dd8b79105c62
Author: Keith Marshall <kei...@us...>
Date:   Mon Sep 17 21:27:47 2012 +0100

    Reinstate lost build-aux submodule yet again!

diff --git a/build-aux b/build-aux
new file mode 160000
index 0000000..e29d336
--- /dev/null
+++ b/build-aux
@@ -0,0 +1 @@
+Subproject commit e29d336021160ae1dfea0d0c9316b79900d33a70

http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw-get;a=commitdiff;h=

commit 369cc076af9e422db173a4d4ce42dd8b79105c62
Author: Keith Marshall <kei...@us...>
Date:   Mon Sep 17 21:27:47 2012 +0100

    Reinstate lost build-aux submodule yet again!

diff --git a/build-aux b/build-aux
new file mode 160000
index 0000000..e29d336
--- /dev/null
+++ b/build-aux
@@ -0,0 +1 @@
+Subproject commit e29d336021160ae1dfea0d0c9316b79900d33a70

http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw-get;a=commitdiff;h=

commit 369cc076af9e422db173a4d4ce42dd8b79105c62
Author: Keith Marshall <kei...@us...>
Date:   Mon Sep 17 21:27:47 2012 +0100

    Reinstate lost build-aux submodule yet again!

diff --git a/build-aux b/build-aux
new file mode 160000
index 0000000..e29d336
--- /dev/null
+++ b/build-aux
@@ -0,0 +1 @@
+Subproject commit e29d336021160ae1dfea0d0c9316b79900d33a70

http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw-get;a=commitdiff;h=

commit 369cc076af9e422db173a4d4ce42dd8b79105c62
Author: Keith Marshall <kei...@us...>
Date:   Mon Sep 17 21:27:47 2012 +0100

    Reinstate lost build-aux submodule yet again!

diff --git a/build-aux b/build-aux
new file mode 160000
index 0000000..e29d336
--- /dev/null
+++ b/build-aux
@@ -0,0 +1 @@
+Subproject commit e29d336021160ae1dfea0d0c9316b79900d33a70

http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw-get;a=commitdiff;h=

commit 369cc076af9e422db173a4d4ce42dd8b79105c62
Author: Keith Marshall <kei...@us...>
Date:   Mon Sep 17 21:27:47 2012 +0100

    Reinstate lost build-aux submodule yet again!

diff --git a/build-aux b/build-aux
new file mode 160000
index 0000000..e29d336
--- /dev/null
+++ b/build-aux
@@ -0,0 +1 @@
+Subproject commit e29d336021160ae1dfea0d0c9316b79900d33a70

http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw-get;a=commitdiff;h=

commit 369cc076af9e422db173a4d4ce42dd8b79105c62
Author: Keith Marshall <kei...@us...>
Date:   Mon Sep 17 21:27:47 2012 +0100

    Reinstate lost build-aux submodule yet again!

diff --git a/build-aux b/build-aux
new file mode 160000
index 0000000..e29d336
--- /dev/null
+++ b/build-aux
@@ -0,0 +1 @@
+Subproject commit e29d336021160ae1dfea0d0c9316b79900d33a70

-----------------------------------------------------------------------


hooks/post-receive
-- 
Repository: mingw-get

[MinGW-cvs] [git push mingw.org-wsl]Repository: mingw.org-wsl branch redo-filters updated. b6a947ede19da18e2cf8841b1283db350d7e64a6

From: Earnie B. <no...@so...> - 2012-09-21 17:58:38

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw.org-wsl".

The branch, redo-filters has been updated
       via  b6a947ede19da18e2cf8841b1283db350d7e64a6 (commit)
      from  9e7428cac4bfcdbd0018635220f13ea225674fc7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw.org-wsl;a=commitdiff;h=

commit fd0c88828fac399eb5b703354584b6fdc03b8e93
Author: Earnie Boyd <ea...@us...>
Date:   Fri Sep 7 10:36:34 2012 -0400

    	Remove filters for CRTDLL and __MSVCRT__.
    
    	* Makefile.in: Remove -[DU]__MSVCRT__ and -[DU]__CRTDLL__.
    	* crt1.o: Remove CRTDLL specific target.
    	* dllcrt1.o: Ditto.
    	* gcrt1.o: Ditto.
    	* include/assert.h: Modify documentation to remove the use of CRTDLL.
    	* include/setjmp.h: Ditto.
    	* src/libcrt/crt/ofmt_stub.s: Ditto.
    	* include/ctype.h: Ditto.
    	Remove filters for __MSVCRT__ and unneeded #else coding.
    	* include/dirent.h: Ditto.
    	* include/dos.h: Ditto.
    	* include/io.h: Ditto.
    	* include/math.h: Ditto.
    	* include/process.h: Ditto.
    	* include/stdio.h: Ditto.
    	* include/stdlib.h: Ditto.
    	* include/string.h: Ditto.
    	* include/sys/stat.h: Ditto.
    	* include/sys/types.h: Ditto.
    	* include/sys/utime.h: Ditto.
    	* include/tchar.h: Ditto.
    	* include/time.h: Ditto.
    	* include/wchar.h: Ditto.
    	* include/wctype.h: Ditto.
    	* src/libcrt/crt/crt1.c: Ditto.
    	* src/libcrt/crt/init.c: Ditto.
    	* lib/lib32/moldname.def.in: Remove filters for __CRTDLL__.
    	* src/libcrt/tlssup.c: Remove filter for CRTDLL.

diff --git a/ChangeLog b/ChangeLog
index 456f89f..7f5dc47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,38 @@
 2012-09-07  Earnie Boyd  <ea...@us...>
 
+	Remove filters for CRTDLL and __MSVCRT__.
+
+	* Makefile.in: Remove -[DU]__MSVCRT__ and -[DU]__CRTDLL__.
+	* crt1.o: Remove CRTDLL specific target.
+	* dllcrt1.o: Ditto.
+	* gcrt1.o: Ditto.
+	* include/assert.h: Modify documentation to remove the use of CRTDLL.
+	* include/setjmp.h: Ditto.
+	* src/libcrt/crt/ofmt_stub.s: Ditto.
+	* include/ctype.h: Ditto.
+	Remove filters for __MSVCRT__ and unneeded #else coding.
+	* include/dirent.h: Ditto.
+	* include/dos.h: Ditto.
+	* include/io.h: Ditto.
+	* include/math.h: Ditto.
+	* include/process.h: Ditto.
+	* include/stdio.h: Ditto.
+	* include/stdlib.h: Ditto.
+	* include/string.h: Ditto.
+	* include/sys/stat.h: Ditto.
+	* include/sys/types.h: Ditto.
+	* include/sys/utime.h: Ditto.
+	* include/tchar.h: Ditto.
+	* include/time.h: Ditto.
+	* include/wchar.h: Ditto.
+	* include/wctype.h: Ditto.
+	* src/libcrt/crt/crt1.c: Ditto.
+	* src/libcrt/crt/init.c: Ditto.
+	* lib/lib32/moldname.def.in: Remove filters for __CRTDLL__.
+	* src/libcrt/tlssup.c: Remove filter for CRTDLL.
+
+2012-09-07  Earnie Boyd  <ea...@us...>
+
 	Apply LICENSE to all files as appropriate.
 
 	* tests/Makefile.in: Add file preamble.
diff --git a/Makefile.in b/Makefile.in
index 9a8d6e8..d32a229 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -626,7 +626,7 @@ $(msvcrt_DEF): lib/lib32/msvcrt.def.in
 	$(CC) -DRUNTIME=$(basename $(notdir $@)) \
 		-D__FILENAME__=$@ \
 		-D__$(basename $(notdir $@))__=1 \
-		-D__MSVCRT__ -C -E -P -xc-header \
+		-C -E -P -xc-header \
 		$? > $@
 
 
@@ -641,7 +641,7 @@ $(moldname_DEF): lib/lib32/moldname.def.in
 	$(CC) -DRUNTIME=$(basename $(notdir $@)) \
 		-D__FILENAME__=$$F \
 		-D__$(basename $(notdir $@))__=1 \
-		-D__MSVCRT__ -C -E -P -xc-header \
+		-C -E -P -xc-header \
 		$? > $@
 
 SRCDIR := lib/lib32
@@ -693,13 +693,9 @@ lib%.a: %.o
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 SRCDIR := src/libcrt/crt
-$(SRCDIR)/crt1.o $(SRCDIR)/dllcrt1.o:
-	$(MKDIR_P) $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $<
-
 $(SRCDIR)/crt2.o $(SRCDIR)/dllcrt2.o:
 	$(MKDIR_P) $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -D__MSVCRT__ -U__CRTDLL__ -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 $(SRCDIR)/crt1.o: $(SRCDIR)/crt1.c
 $(SRCDIR)/dllcrt1.o: $(SRCDIR)/dllcrt1.c
@@ -716,13 +712,9 @@ $(libscrnsavw_a_OBJECTS): $(libscrnsavw_a_SOURCES)
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $(scrnsavw_o_CFLAGS) -o $@ $<
 
 SRCDIR := misc/gpl/profile
-$(SRCDIR)/gcrt1.o:
-	mkdir -p $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $<
-
 $(SRCDIR)/gcrt2.o:
 	mkdir -p $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -D__MSVCRT__ -U__CRTDLL__ -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 $(SRCDIR)/gcrt1.o $(SRCDIR)/gcrt2.o: $(SRCDIR)/gcrt0.c
 
diff --git a/include/assert.h b/include/assert.h
index 1eddeed..6f9cdd0 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -53,7 +53,7 @@ extern "C" {
 #else /* debugging enabled */
 
 /*
- * CRTDLL nicely supplies a function which does the actual output and
+ * The runtime nicely supplies a function which does the actual output and
  * call to abort.
  */
 _CRTIMP void __cdecl __MINGW_NOTHROW _assert (const char*, const char*, int) __MINGW_ATTRIB_NORETURN;
diff --git a/include/ctype.h b/include/ctype.h
index 28ca1a9..e744a09 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -90,7 +90,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW toupper(int);
 
 /*
  * NOTE: The above are not old name type wrappers, but functions exported
- * explicitly by MSVCRT/CRTDLL. However, underscored versions are also
+ * explicitly by MSVCRT.DLL. However, underscored versions are also
  * exported.
  */
 #ifndef	__STRICT_ANSI__
@@ -105,22 +105,11 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int);
 /* Also defined in stdlib.h */
 #ifndef MB_CUR_MAX
 #ifdef __DECLSPEC_SUPPORTED
-# ifdef __MSVCRT__
-#  define MB_CUR_MAX __mb_cur_max
    __MINGW_IMPORT int __mb_cur_max;
-# else	/* not __MSVCRT */
-#  define MB_CUR_MAX __mb_cur_max_dll
-   __MINGW_IMPORT int __mb_cur_max_dll;
-# endif	/* not __MSVCRT */
-
+#  define MB_CUR_MAX __mb_cur_max
 #else		/* ! __DECLSPEC_SUPPORTED */
-# ifdef __MSVCRT__
    extern int* _imp____mb_cur_max;
 #  define MB_CUR_MAX (*_imp____mb_cur_max)
-# else		/* not __MSVCRT */
-   extern int*  _imp____mb_cur_max_dll;
-#  define MB_CUR_MAX (*_imp____mb_cur_max_dll)
-# endif 	/* not __MSVCRT */
 #endif  	/*  __DECLSPEC_SUPPORTED */
 #endif  /* MB_CUR_MAX */
 
@@ -129,25 +118,15 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int);
 # if __MSVCRT_VERSION__ <= 0x0700
   __MINGW_IMPORT unsigned short _ctype[];
 # endif
-# ifdef __MSVCRT__
   __MINGW_IMPORT unsigned short* _pctype;
-# else /* CRTDLL */
-  __MINGW_IMPORT unsigned short* _pctype_dll;
-# define  _pctype _pctype_dll
-# endif 
 
 #else		/*  __DECLSPEC_SUPPORTED */
 # if __MSVCRT_VERSION__ <= 0x0700
   extern unsigned short** _imp___ctype;
 # define _ctype (*_imp___ctype)
 # endif
-# ifdef __MSVCRT__
   extern unsigned short** _imp___pctype;
 # define _pctype (*_imp___pctype)
-# else /* CRTDLL */
-  extern unsigned short** _imp___pctype_dll;
-# define _pctype (*_imp___pctype_dll)
-# endif /* CRTDLL */
 #endif		/*  __DECLSPEC_SUPPORTED */
 
 /*
diff --git a/include/direct.h b/include/direct.h
index 149b8ed..5c576f5 100644
--- a/include/direct.h
+++ b/include/direct.h
@@ -68,13 +68,11 @@ _CRTIMP unsigned __cdecl __MINGW_NOTHROW _getdiskfree (unsigned, struct _diskfre
 
 #ifndef _WDIRECT_DEFINED
 /* wide character versions. Also in wchar.h */
-#ifdef __MSVCRT__ 
 _CRTIMP int __cdecl __MINGW_NOTHROW _wchdir(const wchar_t*);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetcwd(wchar_t*, int);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetdcwd(int, wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wmkdir(const wchar_t*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wrmdir(const wchar_t*);
-#endif	/* __MSVCRT__ */
 #define _WDIRECT_DEFINED
 #endif
 
diff --git a/include/dos.h b/include/dos.h
index 25d06d4..e2c629f 100644
--- a/include/dos.h
+++ b/include/dos.h
@@ -46,41 +46,6 @@
 extern "C" {
 #endif
 
-#ifndef __MSVCRT__ /* these are in CRTDLL, but not MSVCRT */
-#ifndef __DECLSPEC_SUPPORTED
-extern unsigned int *_imp___basemajor_dll;
-extern unsigned int *_imp___baseminor_dll;
-extern unsigned int *_imp___baseversion_dll;
-extern unsigned int *_imp___osmajor_dll;
-extern unsigned int *_imp___osminor_dll;
-extern unsigned int *_imp___osmode_dll;
-
-#define _basemajor (*_imp___basemajor_dll)
-#define _baseminor (*_imp___baseminor_dll)
-#define _baseversion (*_imp___baseversion_dll)
-#define _osmajor (*_imp___osmajor_dll)
-#define _osminor (*_imp___osminor_dll)
-#define _osmode (*_imp___osmode_dll)
-
-#else /* __DECLSPEC_SUPPORTED */
-
-__MINGW_IMPORT unsigned int _basemajor_dll;
-__MINGW_IMPORT unsigned int _baseminor_dll;
-__MINGW_IMPORT unsigned int _baseversion_dll;
-__MINGW_IMPORT unsigned int _osmajor_dll;
-__MINGW_IMPORT unsigned int _osminor_dll;
-__MINGW_IMPORT unsigned int _osmode_dll;
-
-#define _basemajor _basemajor_dll
-#define _baseminor _baseminor_dll
-#define _baseversion _baseversion_dll
-#define _osmajor _osmajor_dll
-#define _osminor _osminor_dll
-#define _osmode _osmode_dll
-
-#endif /* __DECLSPEC_SUPPORTED */
-#endif /* ! __MSVCRT__ */
-
 #ifndef _DISKFREE_T_DEFINED
 /* needed by _getdiskfree (also in direct.h) */
 struct _diskfree_t {
diff --git a/include/io.h b/include/io.h
index 521871e..77e4559 100644
--- a/include/io.h
+++ b/include/io.h
@@ -267,7 +267,6 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _mkdir (const char*);
 _CRTIMP char* __cdecl __MINGW_NOTHROW _mktemp (char*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _rmdir (const char*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _chmod (const char*, int);
-#ifdef __MSVCRT__
 _CRTIMP __int64 __cdecl __MINGW_NOTHROW _filelengthi64(int);
 #if __MSVCRT_VERSION__ < 0x0800
 _CRTIMP intptr_t __cdecl __MINGW_NOTHROW _findfirsti64(const char*, struct _finddatai64_t*);
@@ -306,8 +305,6 @@ __CRT_INLINE off64_t lseek64 (int fd, off64_t offset, int whence)
 }
 #endif
 
-#endif /* __MSVCRT__ */
-
 #ifndef _NO_OLDNAMES
 
 #ifndef _UWIN
@@ -398,9 +395,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _unlink (const char*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _write (int, const void*, unsigned int);
 
 /* Wide character versions. Also declared in wchar.h. */
-/* Not in crtdll.dll */
 #if !defined (_WIO_DEFINED)
-#if defined (__MSVCRT__)
 _CRTIMP int __cdecl __MINGW_NOTHROW _waccess(const wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wchmod(const wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wcreat(const wchar_t*, int);
@@ -441,7 +436,6 @@ _CRTALIAS intptr_t __cdecl __MINGW_NOTHROW _wfindfirsti64 (const wchar_t* _v1, s
 _CRTALIAS int  __cdecl __MINGW_NOTHROW	_wfindnexti64 (intptr_t _v1, struct _wfinddatai64_t* _v2)	 { return(_wfindnext32i64  (_v1,(struct _wfinddata32i64_t*)_v2)); }
 #endif /* !_USE_32BIT_TIME_T */
 #endif /* __MSVCRT_VERSION__ >= 0x0800 */
-#endif /* defined (__MSVCRT__) */
 #define _WIO_DEFINED
 #endif /* _WIO_DEFINED */
 
diff --git a/include/math.h b/include/math.h
index 03f6bd0..f286999 100644
--- a/include/math.h
+++ b/include/math.h
@@ -106,8 +106,6 @@ extern "C" {
  * __imp__HUGE is a pointer to the actual variable _HUGE in
  * MSVCRT.DLL. If we used _HUGE directly we would get a pointer
  * to a thunk function.
- *
- * NOTE: The CRTDLL version uses _HUGE_dll instead.
  */
 
 #if __MINGW_GNUC_PREREQ(3, 3)
@@ -116,25 +114,13 @@ extern "C" {
 
 #ifndef __DECLSPEC_SUPPORTED
 
-#ifdef __MSVCRT__
 extern double*	_imp___HUGE;
 #define	HUGE_VAL	(*_imp___HUGE)
-#else
-/* CRTDLL */
-extern double*	_imp___HUGE_dll;
-#define	HUGE_VAL	(*_imp___HUGE_dll)
-#endif
 
 #else /* __DECLSPEC_SUPPORTED */
 
-#ifdef __MSVCRT__
 __MINGW_IMPORT double	_HUGE;
 #define	HUGE_VAL	_HUGE
-#else
-/* CRTDLL */
-__MINGW_IMPORT double	_HUGE_dll;
-#define	HUGE_VAL	_HUGE_dll
-#endif
 
 #endif /* __DECLSPEC_SUPPORTED */
 #endif /* __MINGW_GNUC_PREREQ(3, 3) */
diff --git a/include/process.h b/include/process.h
index c8cbb1d..094e644 100644
--- a/include/process.h
+++ b/include/process.h
@@ -121,9 +121,6 @@ _CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wspawnvpe	(int, const wchar_t*, const
 #endif
 
 /*
- * The functions _beginthreadex and _endthreadex are not provided by CRTDLL.
- * They are provided by MSVCRT.
- *
  * NOTE: Apparently _endthread calls CloseHandle on the handle of the thread,
  * making for race conditions if you are not careful. Basically you have to
  * make sure that no-one is going to do *anything* with the thread handle
@@ -135,13 +132,10 @@ _CRTIMP unsigned long __cdecl __MINGW_NOTHROW
 	_beginthread	(void (*)(void *), unsigned, void*);
 _CRTIMP void __cdecl __MINGW_NOTHROW _endthread	(void);
 
-#ifdef	__MSVCRT__
 _CRTIMP unsigned long __cdecl __MINGW_NOTHROW
 	_beginthreadex	(void *, unsigned, unsigned (__stdcall *)

[MinGW-cvs] [git push mingw.org-wsl]Repository: mingw.org-wsl branch redo-filters updated. 9e7428cac4bfcdbd0018635220f13ea225674fc7

From: Earnie B. <no...@so...> - 2012-09-20 13:06:59

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw.org-wsl".

The branch, redo-filters has been updated
       via  9e7428cac4bfcdbd0018635220f13ea225674fc7 (commit)
      from  66fd95c73404ecd59e84ac01a7b772e33e5e1fff (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw.org-wsl;a=commitdiff;h=

commit fd0c88828fac399eb5b703354584b6fdc03b8e93
Author: Earnie Boyd <ea...@us...>
Date:   Fri Sep 7 10:36:34 2012 -0400

    	Remove filters for CRTDLL and __MSVCRT__.
    
    	* Makefile.in: Remove -[DU]__MSVCRT__ and -[DU]__CRTDLL__.
    	* crt1.o: Remove CRTDLL specific target.
    	* dllcrt1.o: Ditto.
    	* gcrt1.o: Ditto.
    	* include/assert.h: Modify documentation to remove the use of CRTDLL.
    	* include/setjmp.h: Ditto.
    	* src/libcrt/crt/ofmt_stub.s: Ditto.
    	* include/ctype.h: Ditto.
    	Remove filters for __MSVCRT__ and unneeded #else coding.
    	* include/dirent.h: Ditto.
    	* include/dos.h: Ditto.
    	* include/io.h: Ditto.
    	* include/math.h: Ditto.
    	* include/process.h: Ditto.
    	* include/stdio.h: Ditto.
    	* include/stdlib.h: Ditto.
    	* include/string.h: Ditto.
    	* include/sys/stat.h: Ditto.
    	* include/sys/types.h: Ditto.
    	* include/sys/utime.h: Ditto.
    	* include/tchar.h: Ditto.
    	* include/time.h: Ditto.
    	* include/wchar.h: Ditto.
    	* include/wctype.h: Ditto.
    	* src/libcrt/crt/crt1.c: Ditto.
    	* src/libcrt/crt/init.c: Ditto.
    	* lib/lib32/moldname.def.in: Remove filters for __CRTDLL__.
    	* src/libcrt/tlssup.c: Remove filter for CRTDLL.

diff --git a/ChangeLog b/ChangeLog
index 456f89f..7f5dc47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,38 @@
 2012-09-07  Earnie Boyd  <ea...@us...>
 
+	Remove filters for CRTDLL and __MSVCRT__.
+
+	* Makefile.in: Remove -[DU]__MSVCRT__ and -[DU]__CRTDLL__.
+	* crt1.o: Remove CRTDLL specific target.
+	* dllcrt1.o: Ditto.
+	* gcrt1.o: Ditto.
+	* include/assert.h: Modify documentation to remove the use of CRTDLL.
+	* include/setjmp.h: Ditto.
+	* src/libcrt/crt/ofmt_stub.s: Ditto.
+	* include/ctype.h: Ditto.
+	Remove filters for __MSVCRT__ and unneeded #else coding.
+	* include/dirent.h: Ditto.
+	* include/dos.h: Ditto.
+	* include/io.h: Ditto.
+	* include/math.h: Ditto.
+	* include/process.h: Ditto.
+	* include/stdio.h: Ditto.
+	* include/stdlib.h: Ditto.
+	* include/string.h: Ditto.
+	* include/sys/stat.h: Ditto.
+	* include/sys/types.h: Ditto.
+	* include/sys/utime.h: Ditto.
+	* include/tchar.h: Ditto.
+	* include/time.h: Ditto.
+	* include/wchar.h: Ditto.
+	* include/wctype.h: Ditto.
+	* src/libcrt/crt/crt1.c: Ditto.
+	* src/libcrt/crt/init.c: Ditto.
+	* lib/lib32/moldname.def.in: Remove filters for __CRTDLL__.
+	* src/libcrt/tlssup.c: Remove filter for CRTDLL.
+
+2012-09-07  Earnie Boyd  <ea...@us...>
+
 	Apply LICENSE to all files as appropriate.
 
 	* tests/Makefile.in: Add file preamble.
diff --git a/Makefile.in b/Makefile.in
index 9a8d6e8..d32a229 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -626,7 +626,7 @@ $(msvcrt_DEF): lib/lib32/msvcrt.def.in
 	$(CC) -DRUNTIME=$(basename $(notdir $@)) \
 		-D__FILENAME__=$@ \
 		-D__$(basename $(notdir $@))__=1 \
-		-D__MSVCRT__ -C -E -P -xc-header \
+		-C -E -P -xc-header \
 		$? > $@
 
 
@@ -641,7 +641,7 @@ $(moldname_DEF): lib/lib32/moldname.def.in
 	$(CC) -DRUNTIME=$(basename $(notdir $@)) \
 		-D__FILENAME__=$$F \
 		-D__$(basename $(notdir $@))__=1 \
-		-D__MSVCRT__ -C -E -P -xc-header \
+		-C -E -P -xc-header \
 		$? > $@
 
 SRCDIR := lib/lib32
@@ -693,13 +693,9 @@ lib%.a: %.o
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 SRCDIR := src/libcrt/crt
-$(SRCDIR)/crt1.o $(SRCDIR)/dllcrt1.o:
-	$(MKDIR_P) $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $<
-
 $(SRCDIR)/crt2.o $(SRCDIR)/dllcrt2.o:
 	$(MKDIR_P) $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -D__MSVCRT__ -U__CRTDLL__ -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 $(SRCDIR)/crt1.o: $(SRCDIR)/crt1.c
 $(SRCDIR)/dllcrt1.o: $(SRCDIR)/dllcrt1.c
@@ -716,13 +712,9 @@ $(libscrnsavw_a_OBJECTS): $(libscrnsavw_a_SOURCES)
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $(scrnsavw_o_CFLAGS) -o $@ $<
 
 SRCDIR := misc/gpl/profile
-$(SRCDIR)/gcrt1.o:
-	mkdir -p $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $<
-
 $(SRCDIR)/gcrt2.o:
 	mkdir -p $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -D__MSVCRT__ -U__CRTDLL__ -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 $(SRCDIR)/gcrt1.o $(SRCDIR)/gcrt2.o: $(SRCDIR)/gcrt0.c
 
diff --git a/include/assert.h b/include/assert.h
index 1eddeed..6f9cdd0 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -53,7 +53,7 @@ extern "C" {
 #else /* debugging enabled */
 
 /*
- * CRTDLL nicely supplies a function which does the actual output and
+ * The runtime nicely supplies a function which does the actual output and
  * call to abort.
  */
 _CRTIMP void __cdecl __MINGW_NOTHROW _assert (const char*, const char*, int) __MINGW_ATTRIB_NORETURN;
diff --git a/include/ctype.h b/include/ctype.h
index 28ca1a9..e744a09 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -90,7 +90,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW toupper(int);
 
 /*
  * NOTE: The above are not old name type wrappers, but functions exported
- * explicitly by MSVCRT/CRTDLL. However, underscored versions are also
+ * explicitly by MSVCRT.DLL. However, underscored versions are also
  * exported.
  */
 #ifndef	__STRICT_ANSI__
@@ -105,22 +105,11 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int);
 /* Also defined in stdlib.h */
 #ifndef MB_CUR_MAX
 #ifdef __DECLSPEC_SUPPORTED
-# ifdef __MSVCRT__
-#  define MB_CUR_MAX __mb_cur_max
    __MINGW_IMPORT int __mb_cur_max;
-# else	/* not __MSVCRT */
-#  define MB_CUR_MAX __mb_cur_max_dll
-   __MINGW_IMPORT int __mb_cur_max_dll;
-# endif	/* not __MSVCRT */
-
+#  define MB_CUR_MAX __mb_cur_max
 #else		/* ! __DECLSPEC_SUPPORTED */
-# ifdef __MSVCRT__
    extern int* _imp____mb_cur_max;
 #  define MB_CUR_MAX (*_imp____mb_cur_max)
-# else		/* not __MSVCRT */
-   extern int*  _imp____mb_cur_max_dll;
-#  define MB_CUR_MAX (*_imp____mb_cur_max_dll)
-# endif 	/* not __MSVCRT */
 #endif  	/*  __DECLSPEC_SUPPORTED */
 #endif  /* MB_CUR_MAX */
 
@@ -129,25 +118,15 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int);
 # if __MSVCRT_VERSION__ <= 0x0700
   __MINGW_IMPORT unsigned short _ctype[];
 # endif
-# ifdef __MSVCRT__
   __MINGW_IMPORT unsigned short* _pctype;
-# else /* CRTDLL */
-  __MINGW_IMPORT unsigned short* _pctype_dll;
-# define  _pctype _pctype_dll
-# endif 
 
 #else		/*  __DECLSPEC_SUPPORTED */
 # if __MSVCRT_VERSION__ <= 0x0700
   extern unsigned short** _imp___ctype;
 # define _ctype (*_imp___ctype)
 # endif
-# ifdef __MSVCRT__
   extern unsigned short** _imp___pctype;
 # define _pctype (*_imp___pctype)
-# else /* CRTDLL */
-  extern unsigned short** _imp___pctype_dll;
-# define _pctype (*_imp___pctype_dll)
-# endif /* CRTDLL */
 #endif		/*  __DECLSPEC_SUPPORTED */
 
 /*
diff --git a/include/direct.h b/include/direct.h
index 149b8ed..5c576f5 100644
--- a/include/direct.h
+++ b/include/direct.h
@@ -68,13 +68,11 @@ _CRTIMP unsigned __cdecl __MINGW_NOTHROW _getdiskfree (unsigned, struct _diskfre
 
 #ifndef _WDIRECT_DEFINED
 /* wide character versions. Also in wchar.h */
-#ifdef __MSVCRT__ 
 _CRTIMP int __cdecl __MINGW_NOTHROW _wchdir(const wchar_t*);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetcwd(wchar_t*, int);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetdcwd(int, wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wmkdir(const wchar_t*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wrmdir(const wchar_t*);
-#endif	/* __MSVCRT__ */
 #define _WDIRECT_DEFINED
 #endif
 
diff --git a/include/dos.h b/include/dos.h
index 25d06d4..e2c629f 100644
--- a/include/dos.h
+++ b/include/dos.h
@@ -46,41 +46,6 @@
 extern "C" {
 #endif
 
-#ifndef __MSVCRT__ /* these are in CRTDLL, but not MSVCRT */
-#ifndef __DECLSPEC_SUPPORTED
-extern unsigned int *_imp___basemajor_dll;
-extern unsigned int *_imp___baseminor_dll;
-extern unsigned int *_imp___baseversion_dll;
-extern unsigned int *_imp___osmajor_dll;
-extern unsigned int *_imp___osminor_dll;
-extern unsigned int *_imp___osmode_dll;
-
-#define _basemajor (*_imp___basemajor_dll)
-#define _baseminor (*_imp___baseminor_dll)
-#define _baseversion (*_imp___baseversion_dll)
-#define _osmajor (*_imp___osmajor_dll)
-#define _osminor (*_imp___osminor_dll)
-#define _osmode (*_imp___osmode_dll)
-
-#else /* __DECLSPEC_SUPPORTED */
-
-__MINGW_IMPORT unsi

[MinGW-cvs] [git push mingw.org-wsl]Repository: mingw.org-wsl branch redo-filters updated. 66fd95c73404ecd59e84ac01a7b772e33e5e1fff

From: Earnie B. <no...@so...> - 2012-09-19 18:39:47

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw.org-wsl".

The branch, redo-filters has been updated
       via  66fd95c73404ecd59e84ac01a7b772e33e5e1fff (commit)
       via  f1c055a57560d3ddd06b765e1f958d39550dc64f (commit)
       via  9e9d065666e3e21edb1d04ff08d499049cc5a831 (commit)
      from  73f6ac0c5a3c485b0bcea20e05f06dc9f705bf6c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw.org-wsl;a=commitdiff;h=

commit fd0c88828fac399eb5b703354584b6fdc03b8e93
Author: Earnie Boyd <ea...@us...>
Date:   Fri Sep 7 10:36:34 2012 -0400

    	Remove filters for CRTDLL and __MSVCRT__.
    
    	* Makefile.in: Remove -[DU]__MSVCRT__ and -[DU]__CRTDLL__.
    	* crt1.o: Remove CRTDLL specific target.
    	* dllcrt1.o: Ditto.
    	* gcrt1.o: Ditto.
    	* include/assert.h: Modify documentation to remove the use of CRTDLL.
    	* include/setjmp.h: Ditto.
    	* src/libcrt/crt/ofmt_stub.s: Ditto.
    	* include/ctype.h: Ditto.
    	Remove filters for __MSVCRT__ and unneeded #else coding.
    	* include/dirent.h: Ditto.
    	* include/dos.h: Ditto.
    	* include/io.h: Ditto.
    	* include/math.h: Ditto.
    	* include/process.h: Ditto.
    	* include/stdio.h: Ditto.
    	* include/stdlib.h: Ditto.
    	* include/string.h: Ditto.
    	* include/sys/stat.h: Ditto.
    	* include/sys/types.h: Ditto.
    	* include/sys/utime.h: Ditto.
    	* include/tchar.h: Ditto.
    	* include/time.h: Ditto.
    	* include/wchar.h: Ditto.
    	* include/wctype.h: Ditto.
    	* src/libcrt/crt/crt1.c: Ditto.
    	* src/libcrt/crt/init.c: Ditto.
    	* lib/lib32/moldname.def.in: Remove filters for __CRTDLL__.
    	* src/libcrt/tlssup.c: Remove filter for CRTDLL.

diff --git a/ChangeLog b/ChangeLog
index 456f89f..7f5dc47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,38 @@
 2012-09-07  Earnie Boyd  <ea...@us...>
 
+	Remove filters for CRTDLL and __MSVCRT__.
+
+	* Makefile.in: Remove -[DU]__MSVCRT__ and -[DU]__CRTDLL__.
+	* crt1.o: Remove CRTDLL specific target.
+	* dllcrt1.o: Ditto.
+	* gcrt1.o: Ditto.
+	* include/assert.h: Modify documentation to remove the use of CRTDLL.
+	* include/setjmp.h: Ditto.
+	* src/libcrt/crt/ofmt_stub.s: Ditto.
+	* include/ctype.h: Ditto.
+	Remove filters for __MSVCRT__ and unneeded #else coding.
+	* include/dirent.h: Ditto.
+	* include/dos.h: Ditto.
+	* include/io.h: Ditto.
+	* include/math.h: Ditto.
+	* include/process.h: Ditto.
+	* include/stdio.h: Ditto.
+	* include/stdlib.h: Ditto.
+	* include/string.h: Ditto.
+	* include/sys/stat.h: Ditto.
+	* include/sys/types.h: Ditto.
+	* include/sys/utime.h: Ditto.
+	* include/tchar.h: Ditto.
+	* include/time.h: Ditto.
+	* include/wchar.h: Ditto.
+	* include/wctype.h: Ditto.
+	* src/libcrt/crt/crt1.c: Ditto.
+	* src/libcrt/crt/init.c: Ditto.
+	* lib/lib32/moldname.def.in: Remove filters for __CRTDLL__.
+	* src/libcrt/tlssup.c: Remove filter for CRTDLL.
+
+2012-09-07  Earnie Boyd  <ea...@us...>
+
 	Apply LICENSE to all files as appropriate.
 
 	* tests/Makefile.in: Add file preamble.
diff --git a/Makefile.in b/Makefile.in
index 9a8d6e8..d32a229 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -626,7 +626,7 @@ $(msvcrt_DEF): lib/lib32/msvcrt.def.in
 	$(CC) -DRUNTIME=$(basename $(notdir $@)) \
 		-D__FILENAME__=$@ \
 		-D__$(basename $(notdir $@))__=1 \
-		-D__MSVCRT__ -C -E -P -xc-header \
+		-C -E -P -xc-header \
 		$? > $@
 
 
@@ -641,7 +641,7 @@ $(moldname_DEF): lib/lib32/moldname.def.in
 	$(CC) -DRUNTIME=$(basename $(notdir $@)) \
 		-D__FILENAME__=$$F \
 		-D__$(basename $(notdir $@))__=1 \
-		-D__MSVCRT__ -C -E -P -xc-header \
+		-C -E -P -xc-header \
 		$? > $@
 
 SRCDIR := lib/lib32
@@ -693,13 +693,9 @@ lib%.a: %.o
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 SRCDIR := src/libcrt/crt
-$(SRCDIR)/crt1.o $(SRCDIR)/dllcrt1.o:
-	$(MKDIR_P) $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $<
-
 $(SRCDIR)/crt2.o $(SRCDIR)/dllcrt2.o:
 	$(MKDIR_P) $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -D__MSVCRT__ -U__CRTDLL__ -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 $(SRCDIR)/crt1.o: $(SRCDIR)/crt1.c
 $(SRCDIR)/dllcrt1.o: $(SRCDIR)/dllcrt1.c
@@ -716,13 +712,9 @@ $(libscrnsavw_a_OBJECTS): $(libscrnsavw_a_SOURCES)
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $(scrnsavw_o_CFLAGS) -o $@ $<
 
 SRCDIR := misc/gpl/profile
-$(SRCDIR)/gcrt1.o:
-	mkdir -p $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $<
-
 $(SRCDIR)/gcrt2.o:
 	mkdir -p $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -D__MSVCRT__ -U__CRTDLL__ -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 $(SRCDIR)/gcrt1.o $(SRCDIR)/gcrt2.o: $(SRCDIR)/gcrt0.c
 
diff --git a/include/assert.h b/include/assert.h
index 1eddeed..6f9cdd0 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -53,7 +53,7 @@ extern "C" {
 #else /* debugging enabled */
 
 /*
- * CRTDLL nicely supplies a function which does the actual output and
+ * The runtime nicely supplies a function which does the actual output and
  * call to abort.
  */
 _CRTIMP void __cdecl __MINGW_NOTHROW _assert (const char*, const char*, int) __MINGW_ATTRIB_NORETURN;
diff --git a/include/ctype.h b/include/ctype.h
index 28ca1a9..e744a09 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -90,7 +90,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW toupper(int);
 
 /*
  * NOTE: The above are not old name type wrappers, but functions exported
- * explicitly by MSVCRT/CRTDLL. However, underscored versions are also
+ * explicitly by MSVCRT.DLL. However, underscored versions are also
  * exported.
  */
 #ifndef	__STRICT_ANSI__
@@ -105,22 +105,11 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int);
 /* Also defined in stdlib.h */
 #ifndef MB_CUR_MAX
 #ifdef __DECLSPEC_SUPPORTED
-# ifdef __MSVCRT__
-#  define MB_CUR_MAX __mb_cur_max
    __MINGW_IMPORT int __mb_cur_max;
-# else	/* not __MSVCRT */
-#  define MB_CUR_MAX __mb_cur_max_dll
-   __MINGW_IMPORT int __mb_cur_max_dll;
-# endif	/* not __MSVCRT */
-
+#  define MB_CUR_MAX __mb_cur_max
 #else		/* ! __DECLSPEC_SUPPORTED */
-# ifdef __MSVCRT__
    extern int* _imp____mb_cur_max;
 #  define MB_CUR_MAX (*_imp____mb_cur_max)
-# else		/* not __MSVCRT */
-   extern int*  _imp____mb_cur_max_dll;
-#  define MB_CUR_MAX (*_imp____mb_cur_max_dll)
-# endif 	/* not __MSVCRT */
 #endif  	/*  __DECLSPEC_SUPPORTED */
 #endif  /* MB_CUR_MAX */
 
@@ -129,25 +118,15 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int);
 # if __MSVCRT_VERSION__ <= 0x0700
   __MINGW_IMPORT unsigned short _ctype[];
 # endif
-# ifdef __MSVCRT__
   __MINGW_IMPORT unsigned short* _pctype;
-# else /* CRTDLL */
-  __MINGW_IMPORT unsigned short* _pctype_dll;
-# define  _pctype _pctype_dll
-# endif 
 
 #else		/*  __DECLSPEC_SUPPORTED */
 # if __MSVCRT_VERSION__ <= 0x0700
   extern unsigned short** _imp___ctype;
 # define _ctype (*_imp___ctype)
 # endif
-# ifdef __MSVCRT__
   extern unsigned short** _imp___pctype;
 # define _pctype (*_imp___pctype)
-# else /* CRTDLL */
-  extern unsigned short** _imp___pctype_dll;
-# define _pctype (*_imp___pctype_dll)
-# endif /* CRTDLL */
 #endif		/*  __DECLSPEC_SUPPORTED */
 
 /*
diff --git a/include/direct.h b/include/direct.h
index 149b8ed..5c576f5 100644
--- a/include/direct.h
+++ b/include/direct.h
@@ -68,13 +68,11 @@ _CRTIMP unsigned __cdecl __MINGW_NOTHROW _getdiskfree (unsigned, struct _diskfre
 
 #ifndef _WDIRECT_DEFINED
 /* wide character versions. Also in wchar.h */
-#ifdef __MSVCRT__ 
 _CRTIMP int __cdecl __MINGW_NOTHROW _wchdir(const wchar_t*);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetcwd(wchar_t*, int);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetdcwd(int, wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wmkdir(const wchar_t*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wrmdir(const wchar_t*);
-#endif	/* __MSVCRT__ */
 #define _WDIRECT_DEFINED
 #endif
 
diff --git a/include/dos.h b/include/dos.h
index 25d06d4..e2c629f 100644
--- a/include/dos.h
+++ b/include/dos.h
@@ -46,41 +46,6 @@
 extern "C" {
 #endif
 
-#ifndef __MSVCRT__ /* these are in CRTDLL, but not MSVCRT */
-#ifndef __DECLSPEC_SUPPORTED
-extern unsigned int *_imp___basemajor_dll;
-extern unsigned int *_imp___baseminor_dll;
-extern unsigned int *_imp___baseversion_dll;
-extern unsigned int *_imp___osmajor_dll;
-extern unsigned int *_imp___osminor_dll;
-extern unsigned int *_imp___osmode_dll;
-
-#define _basemajor (*_imp___basemajor_dll)
-#define _baseminor (*_imp___baseminor_dll)
-#define _baseversion (*_imp___baseversion_dll)
-#define _osmajor (*_imp___osmajor_dll)
-#define _osminor (*_imp___osminor_dll)
-#define _osmode (*_imp___osmode_dll)
-
-#else /* __DECLSPEC_SUPPORTED */
-
-__MINGW_IMPORT unsi

[MinGW-cvs] [git push mingw.org-wsl]Repository: mingw.org-wsl branch redo-filters updated. 73f6ac0c5a3c485b0bcea20e05f06dc9f705bf6c

From: Earnie B. <no...@so...> - 2012-09-18 13:17:28

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw.org-wsl".

The branch, redo-filters has been updated
       via  73f6ac0c5a3c485b0bcea20e05f06dc9f705bf6c (commit)
      from  686b9d21aa238718dc3c8073a4e768522a3d153d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw.org-wsl;a=commitdiff;h=

commit fd0c88828fac399eb5b703354584b6fdc03b8e93
Author: Earnie Boyd <ea...@us...>
Date:   Fri Sep 7 10:36:34 2012 -0400

    	Remove filters for CRTDLL and __MSVCRT__.
    
    	* Makefile.in: Remove -[DU]__MSVCRT__ and -[DU]__CRTDLL__.
    	* crt1.o: Remove CRTDLL specific target.
    	* dllcrt1.o: Ditto.
    	* gcrt1.o: Ditto.
    	* include/assert.h: Modify documentation to remove the use of CRTDLL.
    	* include/setjmp.h: Ditto.
    	* src/libcrt/crt/ofmt_stub.s: Ditto.
    	* include/ctype.h: Ditto.
    	Remove filters for __MSVCRT__ and unneeded #else coding.
    	* include/dirent.h: Ditto.
    	* include/dos.h: Ditto.
    	* include/io.h: Ditto.
    	* include/math.h: Ditto.
    	* include/process.h: Ditto.
    	* include/stdio.h: Ditto.
    	* include/stdlib.h: Ditto.
    	* include/string.h: Ditto.
    	* include/sys/stat.h: Ditto.
    	* include/sys/types.h: Ditto.
    	* include/sys/utime.h: Ditto.
    	* include/tchar.h: Ditto.
    	* include/time.h: Ditto.
    	* include/wchar.h: Ditto.
    	* include/wctype.h: Ditto.
    	* src/libcrt/crt/crt1.c: Ditto.
    	* src/libcrt/crt/init.c: Ditto.
    	* lib/lib32/moldname.def.in: Remove filters for __CRTDLL__.
    	* src/libcrt/tlssup.c: Remove filter for CRTDLL.

diff --git a/ChangeLog b/ChangeLog
index 456f89f..7f5dc47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,38 @@
 2012-09-07  Earnie Boyd  <ea...@us...>
 
+	Remove filters for CRTDLL and __MSVCRT__.
+
+	* Makefile.in: Remove -[DU]__MSVCRT__ and -[DU]__CRTDLL__.
+	* crt1.o: Remove CRTDLL specific target.
+	* dllcrt1.o: Ditto.
+	* gcrt1.o: Ditto.
+	* include/assert.h: Modify documentation to remove the use of CRTDLL.
+	* include/setjmp.h: Ditto.
+	* src/libcrt/crt/ofmt_stub.s: Ditto.
+	* include/ctype.h: Ditto.
+	Remove filters for __MSVCRT__ and unneeded #else coding.
+	* include/dirent.h: Ditto.
+	* include/dos.h: Ditto.
+	* include/io.h: Ditto.
+	* include/math.h: Ditto.
+	* include/process.h: Ditto.
+	* include/stdio.h: Ditto.
+	* include/stdlib.h: Ditto.
+	* include/string.h: Ditto.
+	* include/sys/stat.h: Ditto.
+	* include/sys/types.h: Ditto.
+	* include/sys/utime.h: Ditto.
+	* include/tchar.h: Ditto.
+	* include/time.h: Ditto.
+	* include/wchar.h: Ditto.
+	* include/wctype.h: Ditto.
+	* src/libcrt/crt/crt1.c: Ditto.
+	* src/libcrt/crt/init.c: Ditto.
+	* lib/lib32/moldname.def.in: Remove filters for __CRTDLL__.
+	* src/libcrt/tlssup.c: Remove filter for CRTDLL.
+
+2012-09-07  Earnie Boyd  <ea...@us...>
+
 	Apply LICENSE to all files as appropriate.
 
 	* tests/Makefile.in: Add file preamble.
diff --git a/Makefile.in b/Makefile.in
index 9a8d6e8..d32a229 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -626,7 +626,7 @@ $(msvcrt_DEF): lib/lib32/msvcrt.def.in
 	$(CC) -DRUNTIME=$(basename $(notdir $@)) \
 		-D__FILENAME__=$@ \
 		-D__$(basename $(notdir $@))__=1 \
-		-D__MSVCRT__ -C -E -P -xc-header \
+		-C -E -P -xc-header \
 		$? > $@
 
 
@@ -641,7 +641,7 @@ $(moldname_DEF): lib/lib32/moldname.def.in
 	$(CC) -DRUNTIME=$(basename $(notdir $@)) \
 		-D__FILENAME__=$$F \
 		-D__$(basename $(notdir $@))__=1 \
-		-D__MSVCRT__ -C -E -P -xc-header \
+		-C -E -P -xc-header \
 		$? > $@
 
 SRCDIR := lib/lib32
@@ -693,13 +693,9 @@ lib%.a: %.o
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 SRCDIR := src/libcrt/crt
-$(SRCDIR)/crt1.o $(SRCDIR)/dllcrt1.o:
-	$(MKDIR_P) $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $<
-
 $(SRCDIR)/crt2.o $(SRCDIR)/dllcrt2.o:
 	$(MKDIR_P) $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -D__MSVCRT__ -U__CRTDLL__ -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 $(SRCDIR)/crt1.o: $(SRCDIR)/crt1.c
 $(SRCDIR)/dllcrt1.o: $(SRCDIR)/dllcrt1.c
@@ -716,13 +712,9 @@ $(libscrnsavw_a_OBJECTS): $(libscrnsavw_a_SOURCES)
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $(scrnsavw_o_CFLAGS) -o $@ $<
 
 SRCDIR := misc/gpl/profile
-$(SRCDIR)/gcrt1.o:
-	mkdir -p $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $<
-
 $(SRCDIR)/gcrt2.o:
 	mkdir -p $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -D__MSVCRT__ -U__CRTDLL__ -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 $(SRCDIR)/gcrt1.o $(SRCDIR)/gcrt2.o: $(SRCDIR)/gcrt0.c
 
diff --git a/include/assert.h b/include/assert.h
index 1eddeed..6f9cdd0 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -53,7 +53,7 @@ extern "C" {
 #else /* debugging enabled */
 
 /*
- * CRTDLL nicely supplies a function which does the actual output and
+ * The runtime nicely supplies a function which does the actual output and
  * call to abort.
  */
 _CRTIMP void __cdecl __MINGW_NOTHROW _assert (const char*, const char*, int) __MINGW_ATTRIB_NORETURN;
diff --git a/include/ctype.h b/include/ctype.h
index 28ca1a9..e744a09 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -90,7 +90,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW toupper(int);
 
 /*
  * NOTE: The above are not old name type wrappers, but functions exported
- * explicitly by MSVCRT/CRTDLL. However, underscored versions are also
+ * explicitly by MSVCRT.DLL. However, underscored versions are also
  * exported.
  */
 #ifndef	__STRICT_ANSI__
@@ -105,22 +105,11 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int);
 /* Also defined in stdlib.h */
 #ifndef MB_CUR_MAX
 #ifdef __DECLSPEC_SUPPORTED
-# ifdef __MSVCRT__
-#  define MB_CUR_MAX __mb_cur_max
    __MINGW_IMPORT int __mb_cur_max;
-# else	/* not __MSVCRT */
-#  define MB_CUR_MAX __mb_cur_max_dll
-   __MINGW_IMPORT int __mb_cur_max_dll;
-# endif	/* not __MSVCRT */
-
+#  define MB_CUR_MAX __mb_cur_max
 #else		/* ! __DECLSPEC_SUPPORTED */
-# ifdef __MSVCRT__
    extern int* _imp____mb_cur_max;
 #  define MB_CUR_MAX (*_imp____mb_cur_max)
-# else		/* not __MSVCRT */
-   extern int*  _imp____mb_cur_max_dll;
-#  define MB_CUR_MAX (*_imp____mb_cur_max_dll)
-# endif 	/* not __MSVCRT */
 #endif  	/*  __DECLSPEC_SUPPORTED */
 #endif  /* MB_CUR_MAX */
 
@@ -129,25 +118,15 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int);
 # if __MSVCRT_VERSION__ <= 0x0700
   __MINGW_IMPORT unsigned short _ctype[];
 # endif
-# ifdef __MSVCRT__
   __MINGW_IMPORT unsigned short* _pctype;
-# else /* CRTDLL */
-  __MINGW_IMPORT unsigned short* _pctype_dll;
-# define  _pctype _pctype_dll
-# endif 
 
 #else		/*  __DECLSPEC_SUPPORTED */
 # if __MSVCRT_VERSION__ <= 0x0700
   extern unsigned short** _imp___ctype;
 # define _ctype (*_imp___ctype)
 # endif
-# ifdef __MSVCRT__
   extern unsigned short** _imp___pctype;
 # define _pctype (*_imp___pctype)
-# else /* CRTDLL */
-  extern unsigned short** _imp___pctype_dll;
-# define _pctype (*_imp___pctype_dll)
-# endif /* CRTDLL */
 #endif		/*  __DECLSPEC_SUPPORTED */
 
 /*
diff --git a/include/direct.h b/include/direct.h
index 149b8ed..5c576f5 100644
--- a/include/direct.h
+++ b/include/direct.h
@@ -68,13 +68,11 @@ _CRTIMP unsigned __cdecl __MINGW_NOTHROW _getdiskfree (unsigned, struct _diskfre
 
 #ifndef _WDIRECT_DEFINED
 /* wide character versions. Also in wchar.h */
-#ifdef __MSVCRT__ 
 _CRTIMP int __cdecl __MINGW_NOTHROW _wchdir(const wchar_t*);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetcwd(wchar_t*, int);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetdcwd(int, wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wmkdir(const wchar_t*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wrmdir(const wchar_t*);
-#endif	/* __MSVCRT__ */
 #define _WDIRECT_DEFINED
 #endif
 
diff --git a/include/dos.h b/include/dos.h
index 25d06d4..e2c629f 100644
--- a/include/dos.h
+++ b/include/dos.h
@@ -46,41 +46,6 @@
 extern "C" {
 #endif
 
-#ifndef __MSVCRT__ /* these are in CRTDLL, but not MSVCRT */
-#ifndef __DECLSPEC_SUPPORTED
-extern unsigned int *_imp___basemajor_dll;
-extern unsigned int *_imp___baseminor_dll;
-extern unsigned int *_imp___baseversion_dll;
-extern unsigned int *_imp___osmajor_dll;
-extern unsigned int *_imp___osminor_dll;
-extern unsigned int *_imp___osmode_dll;
-
-#define _basemajor (*_imp___basemajor_dll)
-#define _baseminor (*_imp___baseminor_dll)
-#define _baseversion (*_imp___baseversion_dll)
-#define _osmajor (*_imp___osmajor_dll)
-#define _osminor (*_imp___osminor_dll)
-#define _osmode (*_imp___osmode_dll)
-
-#else /* __DECLSPEC_SUPPORTED */
-
-__MINGW_IMPORT unsigned int _basemajor_dll;
-__MINGW_IMPORT unsigned int _baseminor_dll;
-__MINGW_IMPORT unsigned int _baseversion_dll;
-__MINGW_IMPORT unsigned int _osmajor_dll;
-__MINGW_IMPORT unsigned int _osminor_dll;
-__MINGW_IMPORT unsigned int _osmode_dll;
-
-#define _basemajor _basemajor_dll
-#define _baseminor _baseminor_dll
-#define _baseversion _baseversion_dll
-#define _osmajor _osmajor_dll
-#define _osminor _osminor_dll
-#define _osmode _osmode_dll
-
-#endif /* __DECLSPEC_SUPPORTED */
-#endif /* ! __MSVCRT__ */
-
 #ifndef _DISKFREE_T_DEFINED
 /* needed by _getdiskfree (also in direct.h) */
 struct _diskfree_t {
diff --git a/include/io.h b/include/io.h
index 521871e..77e4559 100644
--- a/include/io.h
+++ b/include/io.h
@@ -267,7 +267,6 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _mkdir (const char*);
 _CRTIMP char* __cdecl __MINGW_NOTHROW _mktemp (char*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _rmdir (const char*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _chmod (const char*, int);
-#ifdef __MSVCRT__
 _CRTIMP __int64 __cdecl __MINGW_NOTHROW _filelengthi64(int);
 #if __MSVCRT_VERSION__ < 0x0800
 _CRTIMP intptr_t __cdecl __MINGW_NOTHROW _findfirsti64(const char*, struct _finddatai64_t*);
@@ -306,8 +305,6 @@ __CRT_INLINE off64_t lseek64 (int fd, off64_t offset, int whence)
 }
 #endif
 
-#endif /* __MSVCRT__ */
-
 #ifndef _NO_OLDNAMES
 
 #ifndef _UWIN
@@ -398,9 +395,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _unlink (const char*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _write (int, const void*, unsigned int);
 
 /* Wide character versions. Also declared in wchar.h. */
-/* Not in crtdll.dll */
 #if !defined (_WIO_DEFINED)
-#if defined (__MSVCRT__)
 _CRTIMP int __cdecl __MINGW_NOTHROW _waccess(const wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wchmod(const wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wcreat(const wchar_t*, int);
@@ -441,7 +436,6 @@ _CRTALIAS intptr_t __cdecl __MINGW_NOTHROW _wfindfirsti64 (const wchar_t* _v1, s
 _CRTALIAS int  __cdecl __MINGW_NOTHROW	_wfindnexti64 (intptr_t _v1, struct _wfinddatai64_t* _v2)	 { return(_wfindnext32i64  (_v1,(struct _wfinddata32i64_t*)_v2)); }
 #endif /* !_USE_32BIT_TIME_T */
 #endif /* __MSVCRT_VERSION__ >= 0x0800 */
-#endif /* defined (__MSVCRT__) */
 #define _WIO_DEFINED
 #endif /* _WIO_DEFINED */
 
diff --git a/include/math.h b/include/math.h
index 03f6bd0..f286999 100644
--- a/include/math.h
+++ b/include/math.h
@@ -106,8 +106,6 @@ extern "C" {
  * __imp__HUGE is a pointer to the actual variable _HUGE in
  * MSVCRT.DLL. If we used _HUGE directly we would get a pointer
  * to a thunk function.
- *
- * NOTE: The CRTDLL version uses _HUGE_dll instead.
  */
 
 #if __MINGW_GNUC_PREREQ(3, 3)
@@ -116,25 +114,13 @@ extern "C" {
 
 #ifndef __DECLSPEC_SUPPORTED
 
-#ifdef __MSVCRT__
 extern double*	_imp___HUGE;
 #define	HUGE_VAL	(*_imp___HUGE)
-#else
-/* CRTDLL */
-extern double*	_imp___HUGE_dll;
-#define	HUGE_VAL	(*_imp___HUGE_dll)
-#endif
 
 #else /* __DECLSPEC_SUPPORTED */
 
-#ifdef __MSVCRT__
 __MINGW_IMPORT double	_HUGE;
 #define	HUGE_VAL	_HUGE
-#else
-/* CRTDLL */
-__MINGW_IMPORT double	_HUGE_dll;
-#define	HUGE_VAL	_HUGE_dll
-#endif
 
 #endif /* __DECLSPEC_SUPPORTED */
 #endif /* __MINGW_GNUC_PREREQ(3, 3) */
diff --git a/include/process.h b/include/process.h
index c8cbb1d..094e644 100644
--- a/include/process.h
+++ b/include/process.h
@@ -121,9 +121,6 @@ _CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wspawnvpe	(int, const wchar_t*, const
 #endif
 
 /*
- * The functions _beginthreadex and _endthreadex are not provided by CRTDLL.
- * They are provided by MSVCRT.
- *
  * NOTE: Apparently _endthread calls CloseHandle on the handle of the thread,
  * making for race conditions if you are not careful. Basically you have to
  * make sure that no-one is going to do *anything* with the thread handle
@@ -135,13 +132,10 @@ _CRTIMP unsigned long __cdecl __MINGW_NOTHROW
 	_beginthread	(void (*)(void *), unsigned, void*);
 _CRTIMP void __cdecl __MINGW_NOTHROW _endthread	(void);
 
-#ifdef	__MSVCRT__
 _CRTIMP unsigned long __cdecl __MINGW_NOTHROW
 	_beginthreadex	(void *, unsigned, unsigned (__stdcall *)

[MinGW-cvs] [git push mingw-get]Repository: mingw-get branch master updated. r0-5-beta-20120426-1-23-g369cc07

From: Keith M. <no...@so...> - 2012-09-17 20:28:39

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw-get".

The branch, master has been updated
       via  369cc076af9e422db173a4d4ce42dd8b79105c62 (commit)
      from  bb6f14186f084b4c1caca65fc6bc231f736dbfa2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw-get;a=commitdiff;h=

commit 369cc076af9e422db173a4d4ce42dd8b79105c62
Author: Keith Marshall <kei...@us...>
Date:   Mon Sep 17 21:27:47 2012 +0100

    Reinstate lost build-aux submodule yet again!

diff --git a/build-aux b/build-aux
new file mode 160000
index 0000000..e29d336
--- /dev/null
+++ b/build-aux
@@ -0,0 +1 @@
+Subproject commit e29d336021160ae1dfea0d0c9316b79900d33a70

-----------------------------------------------------------------------

Summary of changes:
 build-aux |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
 create mode 160000 build-aux


hooks/post-receive
-- 
Repository: mingw-get

[MinGW-cvs] [git push mingw.org-wsl]Repository: mingw.org-wsl branch redo-filters updated. 686b9d21aa238718dc3c8073a4e768522a3d153d

From: Earnie B. <no...@so...> - 2012-09-13 20:51:23

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw.org-wsl".

The branch, redo-filters has been updated
       via  686b9d21aa238718dc3c8073a4e768522a3d153d (commit)
      from  9313d16b81162e4d6f58aa5b4a08d16dbcbccdb6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw.org-wsl;a=commitdiff;h=

commit fd0c88828fac399eb5b703354584b6fdc03b8e93
Author: Earnie Boyd <ea...@us...>
Date:   Fri Sep 7 10:36:34 2012 -0400

    	Remove filters for CRTDLL and __MSVCRT__.
    
    	* Makefile.in: Remove -[DU]__MSVCRT__ and -[DU]__CRTDLL__.
    	* crt1.o: Remove CRTDLL specific target.
    	* dllcrt1.o: Ditto.
    	* gcrt1.o: Ditto.
    	* include/assert.h: Modify documentation to remove the use of CRTDLL.
    	* include/setjmp.h: Ditto.
    	* src/libcrt/crt/ofmt_stub.s: Ditto.
    	* include/ctype.h: Ditto.
    	Remove filters for __MSVCRT__ and unneeded #else coding.
    	* include/dirent.h: Ditto.
    	* include/dos.h: Ditto.
    	* include/io.h: Ditto.
    	* include/math.h: Ditto.
    	* include/process.h: Ditto.
    	* include/stdio.h: Ditto.
    	* include/stdlib.h: Ditto.
    	* include/string.h: Ditto.
    	* include/sys/stat.h: Ditto.
    	* include/sys/types.h: Ditto.
    	* include/sys/utime.h: Ditto.
    	* include/tchar.h: Ditto.
    	* include/time.h: Ditto.
    	* include/wchar.h: Ditto.
    	* include/wctype.h: Ditto.
    	* src/libcrt/crt/crt1.c: Ditto.
    	* src/libcrt/crt/init.c: Ditto.
    	* lib/lib32/moldname.def.in: Remove filters for __CRTDLL__.
    	* src/libcrt/tlssup.c: Remove filter for CRTDLL.

diff --git a/ChangeLog b/ChangeLog
index 456f89f..7f5dc47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,38 @@
 2012-09-07  Earnie Boyd  <ea...@us...>
 
+	Remove filters for CRTDLL and __MSVCRT__.
+
+	* Makefile.in: Remove -[DU]__MSVCRT__ and -[DU]__CRTDLL__.
+	* crt1.o: Remove CRTDLL specific target.
+	* dllcrt1.o: Ditto.
+	* gcrt1.o: Ditto.
+	* include/assert.h: Modify documentation to remove the use of CRTDLL.
+	* include/setjmp.h: Ditto.
+	* src/libcrt/crt/ofmt_stub.s: Ditto.
+	* include/ctype.h: Ditto.
+	Remove filters for __MSVCRT__ and unneeded #else coding.
+	* include/dirent.h: Ditto.
+	* include/dos.h: Ditto.
+	* include/io.h: Ditto.
+	* include/math.h: Ditto.
+	* include/process.h: Ditto.
+	* include/stdio.h: Ditto.
+	* include/stdlib.h: Ditto.
+	* include/string.h: Ditto.
+	* include/sys/stat.h: Ditto.
+	* include/sys/types.h: Ditto.
+	* include/sys/utime.h: Ditto.
+	* include/tchar.h: Ditto.
+	* include/time.h: Ditto.
+	* include/wchar.h: Ditto.
+	* include/wctype.h: Ditto.
+	* src/libcrt/crt/crt1.c: Ditto.
+	* src/libcrt/crt/init.c: Ditto.
+	* lib/lib32/moldname.def.in: Remove filters for __CRTDLL__.
+	* src/libcrt/tlssup.c: Remove filter for CRTDLL.
+
+2012-09-07  Earnie Boyd  <ea...@us...>
+
 	Apply LICENSE to all files as appropriate.
 
 	* tests/Makefile.in: Add file preamble.
diff --git a/Makefile.in b/Makefile.in
index 9a8d6e8..d32a229 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -626,7 +626,7 @@ $(msvcrt_DEF): lib/lib32/msvcrt.def.in
 	$(CC) -DRUNTIME=$(basename $(notdir $@)) \
 		-D__FILENAME__=$@ \
 		-D__$(basename $(notdir $@))__=1 \
-		-D__MSVCRT__ -C -E -P -xc-header \
+		-C -E -P -xc-header \
 		$? > $@
 
 
@@ -641,7 +641,7 @@ $(moldname_DEF): lib/lib32/moldname.def.in
 	$(CC) -DRUNTIME=$(basename $(notdir $@)) \
 		-D__FILENAME__=$$F \
 		-D__$(basename $(notdir $@))__=1 \
-		-D__MSVCRT__ -C -E -P -xc-header \
+		-C -E -P -xc-header \
 		$? > $@
 
 SRCDIR := lib/lib32
@@ -693,13 +693,9 @@ lib%.a: %.o
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 SRCDIR := src/libcrt/crt
-$(SRCDIR)/crt1.o $(SRCDIR)/dllcrt1.o:
-	$(MKDIR_P) $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $<
-
 $(SRCDIR)/crt2.o $(SRCDIR)/dllcrt2.o:
 	$(MKDIR_P) $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -D__MSVCRT__ -U__CRTDLL__ -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 $(SRCDIR)/crt1.o: $(SRCDIR)/crt1.c
 $(SRCDIR)/dllcrt1.o: $(SRCDIR)/dllcrt1.c
@@ -716,13 +712,9 @@ $(libscrnsavw_a_OBJECTS): $(libscrnsavw_a_SOURCES)
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $(scrnsavw_o_CFLAGS) -o $@ $<
 
 SRCDIR := misc/gpl/profile
-$(SRCDIR)/gcrt1.o:
-	mkdir -p $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $<
-
 $(SRCDIR)/gcrt2.o:
 	mkdir -p $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -D__MSVCRT__ -U__CRTDLL__ -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 $(SRCDIR)/gcrt1.o $(SRCDIR)/gcrt2.o: $(SRCDIR)/gcrt0.c
 
diff --git a/include/assert.h b/include/assert.h
index 1eddeed..6f9cdd0 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -53,7 +53,7 @@ extern "C" {
 #else /* debugging enabled */
 
 /*
- * CRTDLL nicely supplies a function which does the actual output and
+ * The runtime nicely supplies a function which does the actual output and
  * call to abort.
  */
 _CRTIMP void __cdecl __MINGW_NOTHROW _assert (const char*, const char*, int) __MINGW_ATTRIB_NORETURN;
diff --git a/include/ctype.h b/include/ctype.h
index 28ca1a9..e744a09 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -90,7 +90,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW toupper(int);
 
 /*
  * NOTE: The above are not old name type wrappers, but functions exported
- * explicitly by MSVCRT/CRTDLL. However, underscored versions are also
+ * explicitly by MSVCRT.DLL. However, underscored versions are also
  * exported.
  */
 #ifndef	__STRICT_ANSI__
@@ -105,22 +105,11 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int);
 /* Also defined in stdlib.h */
 #ifndef MB_CUR_MAX
 #ifdef __DECLSPEC_SUPPORTED
-# ifdef __MSVCRT__
-#  define MB_CUR_MAX __mb_cur_max
    __MINGW_IMPORT int __mb_cur_max;
-# else	/* not __MSVCRT */
-#  define MB_CUR_MAX __mb_cur_max_dll
-   __MINGW_IMPORT int __mb_cur_max_dll;
-# endif	/* not __MSVCRT */
-
+#  define MB_CUR_MAX __mb_cur_max
 #else		/* ! __DECLSPEC_SUPPORTED */
-# ifdef __MSVCRT__
    extern int* _imp____mb_cur_max;
 #  define MB_CUR_MAX (*_imp____mb_cur_max)
-# else		/* not __MSVCRT */
-   extern int*  _imp____mb_cur_max_dll;
-#  define MB_CUR_MAX (*_imp____mb_cur_max_dll)
-# endif 	/* not __MSVCRT */
 #endif  	/*  __DECLSPEC_SUPPORTED */
 #endif  /* MB_CUR_MAX */
 
@@ -129,25 +118,15 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int);
 # if __MSVCRT_VERSION__ <= 0x0700
   __MINGW_IMPORT unsigned short _ctype[];
 # endif
-# ifdef __MSVCRT__
   __MINGW_IMPORT unsigned short* _pctype;
-# else /* CRTDLL */
-  __MINGW_IMPORT unsigned short* _pctype_dll;
-# define  _pctype _pctype_dll
-# endif 
 
 #else		/*  __DECLSPEC_SUPPORTED */
 # if __MSVCRT_VERSION__ <= 0x0700
   extern unsigned short** _imp___ctype;
 # define _ctype (*_imp___ctype)
 # endif
-# ifdef __MSVCRT__
   extern unsigned short** _imp___pctype;
 # define _pctype (*_imp___pctype)
-# else /* CRTDLL */
-  extern unsigned short** _imp___pctype_dll;
-# define _pctype (*_imp___pctype_dll)
-# endif /* CRTDLL */
 #endif		/*  __DECLSPEC_SUPPORTED */
 
 /*
diff --git a/include/direct.h b/include/direct.h
index 149b8ed..5c576f5 100644
--- a/include/direct.h
+++ b/include/direct.h
@@ -68,13 +68,11 @@ _CRTIMP unsigned __cdecl __MINGW_NOTHROW _getdiskfree (unsigned, struct _diskfre
 
 #ifndef _WDIRECT_DEFINED
 /* wide character versions. Also in wchar.h */
-#ifdef __MSVCRT__ 
 _CRTIMP int __cdecl __MINGW_NOTHROW _wchdir(const wchar_t*);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetcwd(wchar_t*, int);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetdcwd(int, wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wmkdir(const wchar_t*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wrmdir(const wchar_t*);
-#endif	/* __MSVCRT__ */
 #define _WDIRECT_DEFINED
 #endif
 
diff --git a/include/dos.h b/include/dos.h
index 25d06d4..e2c629f 100644
--- a/include/dos.h
+++ b/include/dos.h
@@ -46,41 +46,6 @@
 extern "C" {
 #endif
 
-#ifndef __MSVCRT__ /* these are in CRTDLL, but not MSVCRT */
-#ifndef __DECLSPEC_SUPPORTED
-extern unsigned int *_imp___basemajor_dll;
-extern unsigned int *_imp___baseminor_dll;
-extern unsigned int *_imp___baseversion_dll;
-extern unsigned int *_imp___osmajor_dll;
-extern unsigned int *_imp___osminor_dll;
-extern unsigned int *_imp___osmode_dll;
-
-#define _basemajor (*_imp___basemajor_dll)
-#define _baseminor (*_imp___baseminor_dll)
-#define _baseversion (*_imp___baseversion_dll)
-#define _osmajor (*_imp___osmajor_dll)
-#define _osminor (*_imp___osminor_dll)
-#define _osmode (*_imp___osmode_dll)
-
-#else /* __DECLSPEC_SUPPORTED */
-
-__MINGW_IMPORT unsi

[MinGW-cvs] [git push mingw-get]Repository: mingw-get branch master updated. r0-5-beta-20120426-1-22-gbb6f141

From: Keith M. <no...@so...> - 2012-09-12 21:27:57

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw-get".

The branch, master has been updated
       via  bb6f14186f084b4c1caca65fc6bc231f736dbfa2 (commit)
      from  d002e0caee222e3cf38f587f817affb4fe1a9542 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw-get;a=commitdiff;h=

commit bb6f14186f084b4c1caca65fc6bc231f736dbfa2
Author: Keith Marshall <kei...@us...>
Date:   Wed Sep 12 22:26:57 2012 +0100

    Note relocation of m4 when packaging source distribution.

diff --git a/ChangeLog b/ChangeLog
index 7ebb5a3..bbfb799 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-12  Keith Marshall  <kei...@us...>
+
+	Note relocation of m4 when packaging source distribution.
+
+	* Makefile.in (SRCDIST_SUBDIRS): Refer to build-aux/m4, not m4.
+
 2012-09-09  Keith Marshall  <kei...@us...>
 
 	Fix typo, and update licensing terms for embedded getopt.c
diff --git a/Makefile.in b/Makefile.in
index 66a90c0..b660144 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -175,8 +175,8 @@ LICENCE_FILES = README COPYING
 SRCDIST_FILES = $(LICENCE_FILES) ChangeLog NEWS INSTALL \
   aclocal.m4 configure.ac configure Makefile.in version.c.in
 
-SRCDIST_SUBDIRS = build-aux icons m4 src src/pkginfo srcdist-doc \
-  scripts/libexec tinyxml xml
+SRCDIST_SUBDIRS = build-aux build-aux/m4 icons src src/pkginfo \
+  srcdist-doc scripts/libexec tinyxml xml
 
 # The names of distributed pacakge archive files incorporate version
 # information, derived from PACKAGE_VERSION; this is decomposed, so that
diff --git a/build-aux b/build-aux
deleted file mode 160000
index e29d336..0000000
--- a/build-aux
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e29d336021160ae1dfea0d0c9316b79900d33a70

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog   |    6 ++++++
 Makefile.in |    4 ++--
 build-aux   |    1 -
 3 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 160000 build-aux


hooks/post-receive
-- 
Repository: mingw-get

[MinGW-cvs] [git push mingw-get]Repository: mingw-get branch master updated. r0-5-beta-20120426-1-21-gd002e0c

From: Keith M. <no...@so...> - 2012-09-12 20:47:53

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw-get".

The branch, master has been updated
       via  d002e0caee222e3cf38f587f817affb4fe1a9542 (commit)
      from  aed3212803129a9cb08b9f112ea43eb5e1eb11be (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw-get;a=commitdiff;h=

commit d002e0caee222e3cf38f587f817affb4fe1a9542
Author: Keith Marshall <kei...@us...>
Date:   Wed Sep 12 21:47:02 2012 +0100

    Reinstate lost build-aux submodule yet again!

diff --git a/build-aux b/build-aux
new file mode 160000
index 0000000..e29d336
--- /dev/null
+++ b/build-aux
@@ -0,0 +1 @@
+Subproject commit e29d336021160ae1dfea0d0c9316b79900d33a70

-----------------------------------------------------------------------

Summary of changes:
 build-aux |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
 create mode 160000 build-aux


hooks/post-receive
-- 
Repository: mingw-get

[MinGW-cvs] [git push mingw.org-wsl]Repository: mingw.org-wsl branch redo-filters updated. 9313d16b81162e4d6f58aa5b4a08d16dbcbccdb6

From: Earnie B. <no...@so...> - 2012-09-12 18:11:07

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw.org-wsl".

The branch, redo-filters has been updated
       via  9313d16b81162e4d6f58aa5b4a08d16dbcbccdb6 (commit)
      from  e920ae33a2cffba1b99f00246832fd28b6700da7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw.org-wsl;a=commitdiff;h=

commit fd0c88828fac399eb5b703354584b6fdc03b8e93
Author: Earnie Boyd <ea...@us...>
Date:   Fri Sep 7 10:36:34 2012 -0400

    	Remove filters for CRTDLL and __MSVCRT__.
    
    	* Makefile.in: Remove -[DU]__MSVCRT__ and -[DU]__CRTDLL__.
    	* crt1.o: Remove CRTDLL specific target.
    	* dllcrt1.o: Ditto.
    	* gcrt1.o: Ditto.
    	* include/assert.h: Modify documentation to remove the use of CRTDLL.
    	* include/setjmp.h: Ditto.
    	* src/libcrt/crt/ofmt_stub.s: Ditto.
    	* include/ctype.h: Ditto.
    	Remove filters for __MSVCRT__ and unneeded #else coding.
    	* include/dirent.h: Ditto.
    	* include/dos.h: Ditto.
    	* include/io.h: Ditto.
    	* include/math.h: Ditto.
    	* include/process.h: Ditto.
    	* include/stdio.h: Ditto.
    	* include/stdlib.h: Ditto.
    	* include/string.h: Ditto.
    	* include/sys/stat.h: Ditto.
    	* include/sys/types.h: Ditto.
    	* include/sys/utime.h: Ditto.
    	* include/tchar.h: Ditto.
    	* include/time.h: Ditto.
    	* include/wchar.h: Ditto.
    	* include/wctype.h: Ditto.
    	* src/libcrt/crt/crt1.c: Ditto.
    	* src/libcrt/crt/init.c: Ditto.
    	* lib/lib32/moldname.def.in: Remove filters for __CRTDLL__.
    	* src/libcrt/tlssup.c: Remove filter for CRTDLL.

diff --git a/ChangeLog b/ChangeLog
index 456f89f..7f5dc47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,38 @@
 2012-09-07  Earnie Boyd  <ea...@us...>
 
+	Remove filters for CRTDLL and __MSVCRT__.
+
+	* Makefile.in: Remove -[DU]__MSVCRT__ and -[DU]__CRTDLL__.
+	* crt1.o: Remove CRTDLL specific target.
+	* dllcrt1.o: Ditto.
+	* gcrt1.o: Ditto.
+	* include/assert.h: Modify documentation to remove the use of CRTDLL.
+	* include/setjmp.h: Ditto.
+	* src/libcrt/crt/ofmt_stub.s: Ditto.
+	* include/ctype.h: Ditto.
+	Remove filters for __MSVCRT__ and unneeded #else coding.
+	* include/dirent.h: Ditto.
+	* include/dos.h: Ditto.
+	* include/io.h: Ditto.
+	* include/math.h: Ditto.
+	* include/process.h: Ditto.
+	* include/stdio.h: Ditto.
+	* include/stdlib.h: Ditto.
+	* include/string.h: Ditto.
+	* include/sys/stat.h: Ditto.
+	* include/sys/types.h: Ditto.
+	* include/sys/utime.h: Ditto.
+	* include/tchar.h: Ditto.
+	* include/time.h: Ditto.
+	* include/wchar.h: Ditto.
+	* include/wctype.h: Ditto.
+	* src/libcrt/crt/crt1.c: Ditto.
+	* src/libcrt/crt/init.c: Ditto.
+	* lib/lib32/moldname.def.in: Remove filters for __CRTDLL__.
+	* src/libcrt/tlssup.c: Remove filter for CRTDLL.
+
+2012-09-07  Earnie Boyd  <ea...@us...>
+
 	Apply LICENSE to all files as appropriate.
 
 	* tests/Makefile.in: Add file preamble.
diff --git a/Makefile.in b/Makefile.in
index 9a8d6e8..d32a229 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -626,7 +626,7 @@ $(msvcrt_DEF): lib/lib32/msvcrt.def.in
 	$(CC) -DRUNTIME=$(basename $(notdir $@)) \
 		-D__FILENAME__=$@ \
 		-D__$(basename $(notdir $@))__=1 \
-		-D__MSVCRT__ -C -E -P -xc-header \
+		-C -E -P -xc-header \
 		$? > $@
 
 
@@ -641,7 +641,7 @@ $(moldname_DEF): lib/lib32/moldname.def.in
 	$(CC) -DRUNTIME=$(basename $(notdir $@)) \
 		-D__FILENAME__=$$F \
 		-D__$(basename $(notdir $@))__=1 \
-		-D__MSVCRT__ -C -E -P -xc-header \
+		-C -E -P -xc-header \
 		$? > $@
 
 SRCDIR := lib/lib32
@@ -693,13 +693,9 @@ lib%.a: %.o
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 SRCDIR := src/libcrt/crt
-$(SRCDIR)/crt1.o $(SRCDIR)/dllcrt1.o:
-	$(MKDIR_P) $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $<
-
 $(SRCDIR)/crt2.o $(SRCDIR)/dllcrt2.o:
 	$(MKDIR_P) $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -D__MSVCRT__ -U__CRTDLL__ -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 $(SRCDIR)/crt1.o: $(SRCDIR)/crt1.c
 $(SRCDIR)/dllcrt1.o: $(SRCDIR)/dllcrt1.c
@@ -716,13 +712,9 @@ $(libscrnsavw_a_OBJECTS): $(libscrnsavw_a_SOURCES)
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $(scrnsavw_o_CFLAGS) -o $@ $<
 
 SRCDIR := misc/gpl/profile
-$(SRCDIR)/gcrt1.o:
-	mkdir -p $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $<
-
 $(SRCDIR)/gcrt2.o:
 	mkdir -p $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -D__MSVCRT__ -U__CRTDLL__ -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 $(SRCDIR)/gcrt1.o $(SRCDIR)/gcrt2.o: $(SRCDIR)/gcrt0.c
 
diff --git a/include/assert.h b/include/assert.h
index 1eddeed..6f9cdd0 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -53,7 +53,7 @@ extern "C" {
 #else /* debugging enabled */
 
 /*
- * CRTDLL nicely supplies a function which does the actual output and
+ * The runtime nicely supplies a function which does the actual output and
  * call to abort.
  */
 _CRTIMP void __cdecl __MINGW_NOTHROW _assert (const char*, const char*, int) __MINGW_ATTRIB_NORETURN;
diff --git a/include/ctype.h b/include/ctype.h
index 28ca1a9..e744a09 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -90,7 +90,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW toupper(int);
 
 /*
  * NOTE: The above are not old name type wrappers, but functions exported
- * explicitly by MSVCRT/CRTDLL. However, underscored versions are also
+ * explicitly by MSVCRT.DLL. However, underscored versions are also
  * exported.
  */
 #ifndef	__STRICT_ANSI__
@@ -105,22 +105,11 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int);
 /* Also defined in stdlib.h */
 #ifndef MB_CUR_MAX
 #ifdef __DECLSPEC_SUPPORTED
-# ifdef __MSVCRT__
-#  define MB_CUR_MAX __mb_cur_max
    __MINGW_IMPORT int __mb_cur_max;
-# else	/* not __MSVCRT */
-#  define MB_CUR_MAX __mb_cur_max_dll
-   __MINGW_IMPORT int __mb_cur_max_dll;
-# endif	/* not __MSVCRT */
-
+#  define MB_CUR_MAX __mb_cur_max
 #else		/* ! __DECLSPEC_SUPPORTED */
-# ifdef __MSVCRT__
    extern int* _imp____mb_cur_max;
 #  define MB_CUR_MAX (*_imp____mb_cur_max)
-# else		/* not __MSVCRT */
-   extern int*  _imp____mb_cur_max_dll;
-#  define MB_CUR_MAX (*_imp____mb_cur_max_dll)
-# endif 	/* not __MSVCRT */
 #endif  	/*  __DECLSPEC_SUPPORTED */
 #endif  /* MB_CUR_MAX */
 
@@ -129,25 +118,15 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int);
 # if __MSVCRT_VERSION__ <= 0x0700
   __MINGW_IMPORT unsigned short _ctype[];
 # endif
-# ifdef __MSVCRT__
   __MINGW_IMPORT unsigned short* _pctype;
-# else /* CRTDLL */
-  __MINGW_IMPORT unsigned short* _pctype_dll;
-# define  _pctype _pctype_dll
-# endif 
 
 #else		/*  __DECLSPEC_SUPPORTED */
 # if __MSVCRT_VERSION__ <= 0x0700
   extern unsigned short** _imp___ctype;
 # define _ctype (*_imp___ctype)
 # endif
-# ifdef __MSVCRT__
   extern unsigned short** _imp___pctype;
 # define _pctype (*_imp___pctype)
-# else /* CRTDLL */
-  extern unsigned short** _imp___pctype_dll;
-# define _pctype (*_imp___pctype_dll)
-# endif /* CRTDLL */
 #endif		/*  __DECLSPEC_SUPPORTED */
 
 /*
diff --git a/include/direct.h b/include/direct.h
index 149b8ed..5c576f5 100644
--- a/include/direct.h
+++ b/include/direct.h
@@ -68,13 +68,11 @@ _CRTIMP unsigned __cdecl __MINGW_NOTHROW _getdiskfree (unsigned, struct _diskfre
 
 #ifndef _WDIRECT_DEFINED
 /* wide character versions. Also in wchar.h */
-#ifdef __MSVCRT__ 
 _CRTIMP int __cdecl __MINGW_NOTHROW _wchdir(const wchar_t*);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetcwd(wchar_t*, int);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetdcwd(int, wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wmkdir(const wchar_t*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wrmdir(const wchar_t*);
-#endif	/* __MSVCRT__ */
 #define _WDIRECT_DEFINED
 #endif
 
diff --git a/include/dos.h b/include/dos.h
index 25d06d4..e2c629f 100644
--- a/include/dos.h
+++ b/include/dos.h
@@ -46,41 +46,6 @@
 extern "C" {
 #endif
 
-#ifndef __MSVCRT__ /* these are in CRTDLL, but not MSVCRT */
-#ifndef __DECLSPEC_SUPPORTED
-extern unsigned int *_imp___basemajor_dll;
-extern unsigned int *_imp___baseminor_dll;
-extern unsigned int *_imp___baseversion_dll;
-extern unsigned int *_imp___osmajor_dll;
-extern unsigned int *_imp___osminor_dll;
-extern unsigned int *_imp___osmode_dll;
-
-#define _basemajor (*_imp___basemajor_dll)
-#define _baseminor (*_imp___baseminor_dll)
-#define _baseversion (*_imp___baseversion_dll)
-#define _osmajor (*_imp___osmajor_dll)
-#define _osminor (*_imp___osminor_dll)
-#define _osmode (*_imp___osmode_dll)
-
-#else /* __DECLSPEC_SUPPORTED */
-
-__MINGW_IMPORT unsi

[MinGW-cvs] [git push mingw.org-wsl]Repository: mingw.org-wsl branch redo-filters updated. e920ae33a2cffba1b99f00246832fd28b6700da7

From: Earnie B. <no...@so...> - 2012-09-11 21:09:39

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw.org-wsl".

The branch, redo-filters has been updated
       via  e920ae33a2cffba1b99f00246832fd28b6700da7 (commit)
      from  2d50b249b0246eef6e031153215e9f4939d8824c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw.org-wsl;a=commitdiff;h=

commit fd0c88828fac399eb5b703354584b6fdc03b8e93
Author: Earnie Boyd <ea...@us...>
Date:   Fri Sep 7 10:36:34 2012 -0400

    	Remove filters for CRTDLL and __MSVCRT__.
    
    	* Makefile.in: Remove -[DU]__MSVCRT__ and -[DU]__CRTDLL__.
    	* crt1.o: Remove CRTDLL specific target.
    	* dllcrt1.o: Ditto.
    	* gcrt1.o: Ditto.
    	* include/assert.h: Modify documentation to remove the use of CRTDLL.
    	* include/setjmp.h: Ditto.
    	* src/libcrt/crt/ofmt_stub.s: Ditto.
    	* include/ctype.h: Ditto.
    	Remove filters for __MSVCRT__ and unneeded #else coding.
    	* include/dirent.h: Ditto.
    	* include/dos.h: Ditto.
    	* include/io.h: Ditto.
    	* include/math.h: Ditto.
    	* include/process.h: Ditto.
    	* include/stdio.h: Ditto.
    	* include/stdlib.h: Ditto.
    	* include/string.h: Ditto.
    	* include/sys/stat.h: Ditto.
    	* include/sys/types.h: Ditto.
    	* include/sys/utime.h: Ditto.
    	* include/tchar.h: Ditto.
    	* include/time.h: Ditto.
    	* include/wchar.h: Ditto.
    	* include/wctype.h: Ditto.
    	* src/libcrt/crt/crt1.c: Ditto.
    	* src/libcrt/crt/init.c: Ditto.
    	* lib/lib32/moldname.def.in: Remove filters for __CRTDLL__.
    	* src/libcrt/tlssup.c: Remove filter for CRTDLL.

diff --git a/ChangeLog b/ChangeLog
index 456f89f..7f5dc47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,38 @@
 2012-09-07  Earnie Boyd  <ea...@us...>
 
+	Remove filters for CRTDLL and __MSVCRT__.
+
+	* Makefile.in: Remove -[DU]__MSVCRT__ and -[DU]__CRTDLL__.
+	* crt1.o: Remove CRTDLL specific target.
+	* dllcrt1.o: Ditto.
+	* gcrt1.o: Ditto.
+	* include/assert.h: Modify documentation to remove the use of CRTDLL.
+	* include/setjmp.h: Ditto.
+	* src/libcrt/crt/ofmt_stub.s: Ditto.
+	* include/ctype.h: Ditto.
+	Remove filters for __MSVCRT__ and unneeded #else coding.
+	* include/dirent.h: Ditto.
+	* include/dos.h: Ditto.
+	* include/io.h: Ditto.
+	* include/math.h: Ditto.
+	* include/process.h: Ditto.
+	* include/stdio.h: Ditto.
+	* include/stdlib.h: Ditto.
+	* include/string.h: Ditto.
+	* include/sys/stat.h: Ditto.
+	* include/sys/types.h: Ditto.
+	* include/sys/utime.h: Ditto.
+	* include/tchar.h: Ditto.
+	* include/time.h: Ditto.
+	* include/wchar.h: Ditto.
+	* include/wctype.h: Ditto.
+	* src/libcrt/crt/crt1.c: Ditto.
+	* src/libcrt/crt/init.c: Ditto.
+	* lib/lib32/moldname.def.in: Remove filters for __CRTDLL__.
+	* src/libcrt/tlssup.c: Remove filter for CRTDLL.
+
+2012-09-07  Earnie Boyd  <ea...@us...>
+
 	Apply LICENSE to all files as appropriate.
 
 	* tests/Makefile.in: Add file preamble.
diff --git a/Makefile.in b/Makefile.in
index 9a8d6e8..d32a229 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -626,7 +626,7 @@ $(msvcrt_DEF): lib/lib32/msvcrt.def.in
 	$(CC) -DRUNTIME=$(basename $(notdir $@)) \
 		-D__FILENAME__=$@ \
 		-D__$(basename $(notdir $@))__=1 \
-		-D__MSVCRT__ -C -E -P -xc-header \
+		-C -E -P -xc-header \
 		$? > $@
 
 
@@ -641,7 +641,7 @@ $(moldname_DEF): lib/lib32/moldname.def.in
 	$(CC) -DRUNTIME=$(basename $(notdir $@)) \
 		-D__FILENAME__=$$F \
 		-D__$(basename $(notdir $@))__=1 \
-		-D__MSVCRT__ -C -E -P -xc-header \
+		-C -E -P -xc-header \
 		$? > $@
 
 SRCDIR := lib/lib32
@@ -693,13 +693,9 @@ lib%.a: %.o
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 SRCDIR := src/libcrt/crt
-$(SRCDIR)/crt1.o $(SRCDIR)/dllcrt1.o:
-	$(MKDIR_P) $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $<
-
 $(SRCDIR)/crt2.o $(SRCDIR)/dllcrt2.o:
 	$(MKDIR_P) $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -D__MSVCRT__ -U__CRTDLL__ -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 $(SRCDIR)/crt1.o: $(SRCDIR)/crt1.c
 $(SRCDIR)/dllcrt1.o: $(SRCDIR)/dllcrt1.c
@@ -716,13 +712,9 @@ $(libscrnsavw_a_OBJECTS): $(libscrnsavw_a_SOURCES)
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $(scrnsavw_o_CFLAGS) -o $@ $<
 
 SRCDIR := misc/gpl/profile
-$(SRCDIR)/gcrt1.o:
-	mkdir -p $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $<
-
 $(SRCDIR)/gcrt2.o:
 	mkdir -p $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -D__MSVCRT__ -U__CRTDLL__ -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 $(SRCDIR)/gcrt1.o $(SRCDIR)/gcrt2.o: $(SRCDIR)/gcrt0.c
 
diff --git a/include/assert.h b/include/assert.h
index 1eddeed..6f9cdd0 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -53,7 +53,7 @@ extern "C" {
 #else /* debugging enabled */
 
 /*
- * CRTDLL nicely supplies a function which does the actual output and
+ * The runtime nicely supplies a function which does the actual output and
  * call to abort.
  */
 _CRTIMP void __cdecl __MINGW_NOTHROW _assert (const char*, const char*, int) __MINGW_ATTRIB_NORETURN;
diff --git a/include/ctype.h b/include/ctype.h
index 28ca1a9..e744a09 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -90,7 +90,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW toupper(int);
 
 /*
  * NOTE: The above are not old name type wrappers, but functions exported
- * explicitly by MSVCRT/CRTDLL. However, underscored versions are also
+ * explicitly by MSVCRT.DLL. However, underscored versions are also
  * exported.
  */
 #ifndef	__STRICT_ANSI__
@@ -105,22 +105,11 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int);
 /* Also defined in stdlib.h */
 #ifndef MB_CUR_MAX
 #ifdef __DECLSPEC_SUPPORTED
-# ifdef __MSVCRT__
-#  define MB_CUR_MAX __mb_cur_max
    __MINGW_IMPORT int __mb_cur_max;
-# else	/* not __MSVCRT */
-#  define MB_CUR_MAX __mb_cur_max_dll
-   __MINGW_IMPORT int __mb_cur_max_dll;
-# endif	/* not __MSVCRT */
-
+#  define MB_CUR_MAX __mb_cur_max
 #else		/* ! __DECLSPEC_SUPPORTED */
-# ifdef __MSVCRT__
    extern int* _imp____mb_cur_max;
 #  define MB_CUR_MAX (*_imp____mb_cur_max)
-# else		/* not __MSVCRT */
-   extern int*  _imp____mb_cur_max_dll;
-#  define MB_CUR_MAX (*_imp____mb_cur_max_dll)
-# endif 	/* not __MSVCRT */
 #endif  	/*  __DECLSPEC_SUPPORTED */
 #endif  /* MB_CUR_MAX */
 
@@ -129,25 +118,15 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int);
 # if __MSVCRT_VERSION__ <= 0x0700
   __MINGW_IMPORT unsigned short _ctype[];
 # endif
-# ifdef __MSVCRT__
   __MINGW_IMPORT unsigned short* _pctype;
-# else /* CRTDLL */
-  __MINGW_IMPORT unsigned short* _pctype_dll;
-# define  _pctype _pctype_dll
-# endif 
 
 #else		/*  __DECLSPEC_SUPPORTED */
 # if __MSVCRT_VERSION__ <= 0x0700
   extern unsigned short** _imp___ctype;
 # define _ctype (*_imp___ctype)
 # endif
-# ifdef __MSVCRT__
   extern unsigned short** _imp___pctype;
 # define _pctype (*_imp___pctype)
-# else /* CRTDLL */
-  extern unsigned short** _imp___pctype_dll;
-# define _pctype (*_imp___pctype_dll)
-# endif /* CRTDLL */
 #endif		/*  __DECLSPEC_SUPPORTED */
 
 /*
diff --git a/include/direct.h b/include/direct.h
index 149b8ed..5c576f5 100644
--- a/include/direct.h
+++ b/include/direct.h
@@ -68,13 +68,11 @@ _CRTIMP unsigned __cdecl __MINGW_NOTHROW _getdiskfree (unsigned, struct _diskfre
 
 #ifndef _WDIRECT_DEFINED
 /* wide character versions. Also in wchar.h */
-#ifdef __MSVCRT__ 
 _CRTIMP int __cdecl __MINGW_NOTHROW _wchdir(const wchar_t*);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetcwd(wchar_t*, int);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetdcwd(int, wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wmkdir(const wchar_t*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wrmdir(const wchar_t*);
-#endif	/* __MSVCRT__ */
 #define _WDIRECT_DEFINED
 #endif
 
diff --git a/include/dos.h b/include/dos.h
index 25d06d4..e2c629f 100644
--- a/include/dos.h
+++ b/include/dos.h
@@ -46,41 +46,6 @@
 extern "C" {
 #endif
 
-#ifndef __MSVCRT__ /* these are in CRTDLL, but not MSVCRT */
-#ifndef __DECLSPEC_SUPPORTED
-extern unsigned int *_imp___basemajor_dll;
-extern unsigned int *_imp___baseminor_dll;
-extern unsigned int *_imp___baseversion_dll;
-extern unsigned int *_imp___osmajor_dll;
-extern unsigned int *_imp___osminor_dll;
-extern unsigned int *_imp___osmode_dll;
-
-#define _basemajor (*_imp___basemajor_dll)
-#define _baseminor (*_imp___baseminor_dll)
-#define _baseversion (*_imp___baseversion_dll)
-#define _osmajor (*_imp___osmajor_dll)
-#define _osminor (*_imp___osminor_dll)
-#define _osmode (*_imp___osmode_dll)
-
-#else /* __DECLSPEC_SUPPORTED */
-
-__MINGW_IMPORT unsigned int _basemajor_dll;
-__MINGW_IMPORT unsigned int _baseminor_dll;
-__MINGW_IMPORT unsigned int _baseversion_dll;
-__MINGW_IMPORT unsigned int _osmajor_dll;
-__MINGW_IMPORT unsigned int _osminor_dll;
-__MINGW_IMPORT unsigned int _osmode_dll;
-
-#define _basemajor _basemajor_dll
-#define _baseminor _baseminor_dll
-#define _baseversion _baseversion_dll
-#define _osmajor _osmajor_dll
-#define _osminor _osminor_dll
-#define _osmode _osmode_dll
-
-#endif /* __DECLSPEC_SUPPORTED */
-#endif /* ! __MSVCRT__ */
-
 #ifndef _DISKFREE_T_DEFINED
 /* needed by _getdiskfree (also in direct.h) */
 struct _diskfree_t {
diff --git a/include/io.h b/include/io.h
index 521871e..77e4559 100644
--- a/include/io.h
+++ b/include/io.h
@@ -267,7 +267,6 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _mkdir (const char*);
 _CRTIMP char* __cdecl __MINGW_NOTHROW _mktemp (char*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _rmdir (const char*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _chmod (const char*, int);
-#ifdef __MSVCRT__
 _CRTIMP __int64 __cdecl __MINGW_NOTHROW _filelengthi64(int);
 #if __MSVCRT_VERSION__ < 0x0800
 _CRTIMP intptr_t __cdecl __MINGW_NOTHROW _findfirsti64(const char*, struct _finddatai64_t*);
@@ -306,8 +305,6 @@ __CRT_INLINE off64_t lseek64 (int fd, off64_t offset, int whence)
 }
 #endif
 
-#endif /* __MSVCRT__ */
-
 #ifndef _NO_OLDNAMES
 
 #ifndef _UWIN
@@ -398,9 +395,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _unlink (const char*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _write (int, const void*, unsigned int);
 
 /* Wide character versions. Also declared in wchar.h. */
-/* Not in crtdll.dll */
 #if !defined (_WIO_DEFINED)
-#if defined (__MSVCRT__)
 _CRTIMP int __cdecl __MINGW_NOTHROW _waccess(const wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wchmod(const wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wcreat(const wchar_t*, int);
@@ -441,7 +436,6 @@ _CRTALIAS intptr_t __cdecl __MINGW_NOTHROW _wfindfirsti64 (const wchar_t* _v1, s
 _CRTALIAS int  __cdecl __MINGW_NOTHROW	_wfindnexti64 (intptr_t _v1, struct _wfinddatai64_t* _v2)	 { return(_wfindnext32i64  (_v1,(struct _wfinddata32i64_t*)_v2)); }
 #endif /* !_USE_32BIT_TIME_T */
 #endif /* __MSVCRT_VERSION__ >= 0x0800 */
-#endif /* defined (__MSVCRT__) */
 #define _WIO_DEFINED
 #endif /* _WIO_DEFINED */
 
diff --git a/include/math.h b/include/math.h
index 03f6bd0..f286999 100644
--- a/include/math.h
+++ b/include/math.h
@@ -106,8 +106,6 @@ extern "C" {
  * __imp__HUGE is a pointer to the actual variable _HUGE in
  * MSVCRT.DLL. If we used _HUGE directly we would get a pointer
  * to a thunk function.
- *
- * NOTE: The CRTDLL version uses _HUGE_dll instead.
  */
 
 #if __MINGW_GNUC_PREREQ(3, 3)
@@ -116,25 +114,13 @@ extern "C" {
 
 #ifndef __DECLSPEC_SUPPORTED
 
-#ifdef __MSVCRT__
 extern double*	_imp___HUGE;
 #define	HUGE_VAL	(*_imp___HUGE)
-#else
-/* CRTDLL */
-extern double*	_imp___HUGE_dll;
-#define	HUGE_VAL	(*_imp___HUGE_dll)
-#endif
 
 #else /* __DECLSPEC_SUPPORTED */
 
-#ifdef __MSVCRT__
 __MINGW_IMPORT double	_HUGE;
 #define	HUGE_VAL	_HUGE
-#else
-/* CRTDLL */
-__MINGW_IMPORT double	_HUGE_dll;
-#define	HUGE_VAL	_HUGE_dll
-#endif
 
 #endif /* __DECLSPEC_SUPPORTED */
 #endif /* __MINGW_GNUC_PREREQ(3, 3) */
diff --git a/include/process.h b/include/process.h
index c8cbb1d..094e644 100644
--- a/include/process.h
+++ b/include/process.h
@@ -121,9 +121,6 @@ _CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wspawnvpe	(int, const wchar_t*, const
 #endif
 
 /*
- * The functions _beginthreadex and _endthreadex are not provided by CRTDLL.
- * They are provided by MSVCRT.
- *
  * NOTE: Apparently _endthread calls CloseHandle on the handle of the thread,
  * making for race conditions if you are not careful. Basically you have to
  * make sure that no-one is going to do *anything* with the thread handle
@@ -135,13 +132,10 @@ _CRTIMP unsigned long __cdecl __MINGW_NOTHROW
 	_beginthread	(void (*)(void *), unsigned, void*);
 _CRTIMP void __cdecl __MINGW_NOTHROW _endthread	(void);
 
-#ifdef	__MSVCRT__
 _CRTIMP unsigned long __cdecl __MINGW_NOTHROW
 	_beginthreadex	(void *, unsigned, unsigned (__stdcall *)

[MinGW-cvs] [git push mingw.org-wsl]Repository: mingw.org-wsl branch redo-filters updated. 2d50b249b0246eef6e031153215e9f4939d8824c

From: Earnie B. <no...@so...> - 2012-09-11 14:42:57

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw.org-wsl".

The branch, redo-filters has been updated
       via  2d50b249b0246eef6e031153215e9f4939d8824c (commit)
      from  4bb2b3ca71ced2f1f72184ca94d4c11c78daa753 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw.org-wsl;a=commitdiff;h=

commit fd0c88828fac399eb5b703354584b6fdc03b8e93
Author: Earnie Boyd <ea...@us...>
Date:   Fri Sep 7 10:36:34 2012 -0400

    	Remove filters for CRTDLL and __MSVCRT__.
    
    	* Makefile.in: Remove -[DU]__MSVCRT__ and -[DU]__CRTDLL__.
    	* crt1.o: Remove CRTDLL specific target.
    	* dllcrt1.o: Ditto.
    	* gcrt1.o: Ditto.
    	* include/assert.h: Modify documentation to remove the use of CRTDLL.
    	* include/setjmp.h: Ditto.
    	* src/libcrt/crt/ofmt_stub.s: Ditto.
    	* include/ctype.h: Ditto.
    	Remove filters for __MSVCRT__ and unneeded #else coding.
    	* include/dirent.h: Ditto.
    	* include/dos.h: Ditto.
    	* include/io.h: Ditto.
    	* include/math.h: Ditto.
    	* include/process.h: Ditto.
    	* include/stdio.h: Ditto.
    	* include/stdlib.h: Ditto.
    	* include/string.h: Ditto.
    	* include/sys/stat.h: Ditto.
    	* include/sys/types.h: Ditto.
    	* include/sys/utime.h: Ditto.
    	* include/tchar.h: Ditto.
    	* include/time.h: Ditto.
    	* include/wchar.h: Ditto.
    	* include/wctype.h: Ditto.
    	* src/libcrt/crt/crt1.c: Ditto.
    	* src/libcrt/crt/init.c: Ditto.
    	* lib/lib32/moldname.def.in: Remove filters for __CRTDLL__.
    	* src/libcrt/tlssup.c: Remove filter for CRTDLL.

diff --git a/ChangeLog b/ChangeLog
index 456f89f..7f5dc47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,38 @@
 2012-09-07  Earnie Boyd  <ea...@us...>
 
+	Remove filters for CRTDLL and __MSVCRT__.
+
+	* Makefile.in: Remove -[DU]__MSVCRT__ and -[DU]__CRTDLL__.
+	* crt1.o: Remove CRTDLL specific target.
+	* dllcrt1.o: Ditto.
+	* gcrt1.o: Ditto.
+	* include/assert.h: Modify documentation to remove the use of CRTDLL.
+	* include/setjmp.h: Ditto.
+	* src/libcrt/crt/ofmt_stub.s: Ditto.
+	* include/ctype.h: Ditto.
+	Remove filters for __MSVCRT__ and unneeded #else coding.
+	* include/dirent.h: Ditto.
+	* include/dos.h: Ditto.
+	* include/io.h: Ditto.
+	* include/math.h: Ditto.
+	* include/process.h: Ditto.
+	* include/stdio.h: Ditto.
+	* include/stdlib.h: Ditto.
+	* include/string.h: Ditto.
+	* include/sys/stat.h: Ditto.
+	* include/sys/types.h: Ditto.
+	* include/sys/utime.h: Ditto.
+	* include/tchar.h: Ditto.
+	* include/time.h: Ditto.
+	* include/wchar.h: Ditto.
+	* include/wctype.h: Ditto.
+	* src/libcrt/crt/crt1.c: Ditto.
+	* src/libcrt/crt/init.c: Ditto.
+	* lib/lib32/moldname.def.in: Remove filters for __CRTDLL__.
+	* src/libcrt/tlssup.c: Remove filter for CRTDLL.
+
+2012-09-07  Earnie Boyd  <ea...@us...>
+
 	Apply LICENSE to all files as appropriate.
 
 	* tests/Makefile.in: Add file preamble.
diff --git a/Makefile.in b/Makefile.in
index 9a8d6e8..d32a229 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -626,7 +626,7 @@ $(msvcrt_DEF): lib/lib32/msvcrt.def.in
 	$(CC) -DRUNTIME=$(basename $(notdir $@)) \
 		-D__FILENAME__=$@ \
 		-D__$(basename $(notdir $@))__=1 \
-		-D__MSVCRT__ -C -E -P -xc-header \
+		-C -E -P -xc-header \
 		$? > $@
 
 
@@ -641,7 +641,7 @@ $(moldname_DEF): lib/lib32/moldname.def.in
 	$(CC) -DRUNTIME=$(basename $(notdir $@)) \
 		-D__FILENAME__=$$F \
 		-D__$(basename $(notdir $@))__=1 \
-		-D__MSVCRT__ -C -E -P -xc-header \
+		-C -E -P -xc-header \
 		$? > $@
 
 SRCDIR := lib/lib32
@@ -693,13 +693,9 @@ lib%.a: %.o
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 SRCDIR := src/libcrt/crt
-$(SRCDIR)/crt1.o $(SRCDIR)/dllcrt1.o:
-	$(MKDIR_P) $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $<
-
 $(SRCDIR)/crt2.o $(SRCDIR)/dllcrt2.o:
 	$(MKDIR_P) $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -D__MSVCRT__ -U__CRTDLL__ -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 $(SRCDIR)/crt1.o: $(SRCDIR)/crt1.c
 $(SRCDIR)/dllcrt1.o: $(SRCDIR)/dllcrt1.c
@@ -716,13 +712,9 @@ $(libscrnsavw_a_OBJECTS): $(libscrnsavw_a_SOURCES)
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $(scrnsavw_o_CFLAGS) -o $@ $<
 
 SRCDIR := misc/gpl/profile
-$(SRCDIR)/gcrt1.o:
-	mkdir -p $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $<
-
 $(SRCDIR)/gcrt2.o:
 	mkdir -p $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -D__MSVCRT__ -U__CRTDLL__ -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 $(SRCDIR)/gcrt1.o $(SRCDIR)/gcrt2.o: $(SRCDIR)/gcrt0.c
 
diff --git a/include/assert.h b/include/assert.h
index 1eddeed..6f9cdd0 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -53,7 +53,7 @@ extern "C" {
 #else /* debugging enabled */
 
 /*
- * CRTDLL nicely supplies a function which does the actual output and
+ * The runtime nicely supplies a function which does the actual output and
  * call to abort.
  */
 _CRTIMP void __cdecl __MINGW_NOTHROW _assert (const char*, const char*, int) __MINGW_ATTRIB_NORETURN;
diff --git a/include/ctype.h b/include/ctype.h
index 28ca1a9..e744a09 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -90,7 +90,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW toupper(int);
 
 /*
  * NOTE: The above are not old name type wrappers, but functions exported
- * explicitly by MSVCRT/CRTDLL. However, underscored versions are also
+ * explicitly by MSVCRT.DLL. However, underscored versions are also
  * exported.
  */
 #ifndef	__STRICT_ANSI__
@@ -105,22 +105,11 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int);
 /* Also defined in stdlib.h */
 #ifndef MB_CUR_MAX
 #ifdef __DECLSPEC_SUPPORTED
-# ifdef __MSVCRT__
-#  define MB_CUR_MAX __mb_cur_max
    __MINGW_IMPORT int __mb_cur_max;
-# else	/* not __MSVCRT */
-#  define MB_CUR_MAX __mb_cur_max_dll
-   __MINGW_IMPORT int __mb_cur_max_dll;
-# endif	/* not __MSVCRT */
-
+#  define MB_CUR_MAX __mb_cur_max
 #else		/* ! __DECLSPEC_SUPPORTED */
-# ifdef __MSVCRT__
    extern int* _imp____mb_cur_max;
 #  define MB_CUR_MAX (*_imp____mb_cur_max)
-# else		/* not __MSVCRT */
-   extern int*  _imp____mb_cur_max_dll;
-#  define MB_CUR_MAX (*_imp____mb_cur_max_dll)
-# endif 	/* not __MSVCRT */
 #endif  	/*  __DECLSPEC_SUPPORTED */
 #endif  /* MB_CUR_MAX */
 
@@ -129,25 +118,15 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int);
 # if __MSVCRT_VERSION__ <= 0x0700
   __MINGW_IMPORT unsigned short _ctype[];
 # endif
-# ifdef __MSVCRT__
   __MINGW_IMPORT unsigned short* _pctype;
-# else /* CRTDLL */
-  __MINGW_IMPORT unsigned short* _pctype_dll;
-# define  _pctype _pctype_dll
-# endif 
 
 #else		/*  __DECLSPEC_SUPPORTED */
 # if __MSVCRT_VERSION__ <= 0x0700
   extern unsigned short** _imp___ctype;
 # define _ctype (*_imp___ctype)
 # endif
-# ifdef __MSVCRT__
   extern unsigned short** _imp___pctype;
 # define _pctype (*_imp___pctype)
-# else /* CRTDLL */
-  extern unsigned short** _imp___pctype_dll;
-# define _pctype (*_imp___pctype_dll)
-# endif /* CRTDLL */
 #endif		/*  __DECLSPEC_SUPPORTED */
 
 /*
diff --git a/include/direct.h b/include/direct.h
index 149b8ed..5c576f5 100644
--- a/include/direct.h
+++ b/include/direct.h
@@ -68,13 +68,11 @@ _CRTIMP unsigned __cdecl __MINGW_NOTHROW _getdiskfree (unsigned, struct _diskfre
 
 #ifndef _WDIRECT_DEFINED
 /* wide character versions. Also in wchar.h */
-#ifdef __MSVCRT__ 
 _CRTIMP int __cdecl __MINGW_NOTHROW _wchdir(const wchar_t*);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetcwd(wchar_t*, int);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetdcwd(int, wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wmkdir(const wchar_t*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wrmdir(const wchar_t*);
-#endif	/* __MSVCRT__ */
 #define _WDIRECT_DEFINED
 #endif
 
diff --git a/include/dos.h b/include/dos.h
index 25d06d4..e2c629f 100644
--- a/include/dos.h
+++ b/include/dos.h
@@ -46,41 +46,6 @@
 extern "C" {
 #endif
 
-#ifndef __MSVCRT__ /* these are in CRTDLL, but not MSVCRT */
-#ifndef __DECLSPEC_SUPPORTED
-extern unsigned int *_imp___basemajor_dll;
-extern unsigned int *_imp___baseminor_dll;
-extern unsigned int *_imp___baseversion_dll;
-extern unsigned int *_imp___osmajor_dll;
-extern unsigned int *_imp___osminor_dll;
-extern unsigned int *_imp___osmode_dll;
-
-#define _basemajor (*_imp___basemajor_dll)
-#define _baseminor (*_imp___baseminor_dll)
-#define _baseversion (*_imp___baseversion_dll)
-#define _osmajor (*_imp___osmajor_dll)
-#define _osminor (*_imp___osminor_dll)
-#define _osmode (*_imp___osmode_dll)
-
-#else /* __DECLSPEC_SUPPORTED */
-
-__MINGW_IMPORT unsigned int _basemajor_dll;
-__MINGW_IMPORT unsigned int _baseminor_dll;
-__MINGW_IMPORT unsigned int _baseversion_dll;
-__MINGW_IMPORT unsigned int _osmajor_dll;
-__MINGW_IMPORT unsigned int _osminor_dll;
-__MINGW_IMPORT unsigned int _osmode_dll;
-
-#define _basemajor _basemajor_dll
-#define _baseminor _baseminor_dll
-#define _baseversion _baseversion_dll
-#define _osmajor _osmajor_dll
-#define _osminor _osminor_dll
-#define _osmode _osmode_dll
-
-#endif /* __DECLSPEC_SUPPORTED */
-#endif /* ! __MSVCRT__ */
-
 #ifndef _DISKFREE_T_DEFINED
 /* needed by _getdiskfree (also in direct.h) */
 struct _diskfree_t {
diff --git a/include/io.h b/include/io.h
index 521871e..77e4559 100644
--- a/include/io.h
+++ b/include/io.h
@@ -267,7 +267,6 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _mkdir (const char*);
 _CRTIMP char* __cdecl __MINGW_NOTHROW _mktemp (char*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _rmdir (const char*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _chmod (const char*, int);
-#ifdef __MSVCRT__
 _CRTIMP __int64 __cdecl __MINGW_NOTHROW _filelengthi64(int);
 #if __MSVCRT_VERSION__ < 0x0800
 _CRTIMP intptr_t __cdecl __MINGW_NOTHROW _findfirsti64(const char*, struct _finddatai64_t*);
@@ -306,8 +305,6 @@ __CRT_INLINE off64_t lseek64 (int fd, off64_t offset, int whence)
 }
 #endif
 
-#endif /* __MSVCRT__ */
-
 #ifndef _NO_OLDNAMES
 
 #ifndef _UWIN
@@ -398,9 +395,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _unlink (const char*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _write (int, const void*, unsigned int);
 
 /* Wide character versions. Also declared in wchar.h. */
-/* Not in crtdll.dll */
 #if !defined (_WIO_DEFINED)
-#if defined (__MSVCRT__)
 _CRTIMP int __cdecl __MINGW_NOTHROW _waccess(const wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wchmod(const wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wcreat(const wchar_t*, int);
@@ -441,7 +436,6 @@ _CRTALIAS intptr_t __cdecl __MINGW_NOTHROW _wfindfirsti64 (const wchar_t* _v1, s
 _CRTALIAS int  __cdecl __MINGW_NOTHROW	_wfindnexti64 (intptr_t _v1, struct _wfinddatai64_t* _v2)	 { return(_wfindnext32i64  (_v1,(struct _wfinddata32i64_t*)_v2)); }
 #endif /* !_USE_32BIT_TIME_T */
 #endif /* __MSVCRT_VERSION__ >= 0x0800 */
-#endif /* defined (__MSVCRT__) */
 #define _WIO_DEFINED
 #endif /* _WIO_DEFINED */
 
diff --git a/include/math.h b/include/math.h
index 03f6bd0..f286999 100644
--- a/include/math.h
+++ b/include/math.h
@@ -106,8 +106,6 @@ extern "C" {
  * __imp__HUGE is a pointer to the actual variable _HUGE in
  * MSVCRT.DLL. If we used _HUGE directly we would get a pointer
  * to a thunk function.
- *
- * NOTE: The CRTDLL version uses _HUGE_dll instead.
  */
 
 #if __MINGW_GNUC_PREREQ(3, 3)
@@ -116,25 +114,13 @@ extern "C" {
 
 #ifndef __DECLSPEC_SUPPORTED
 
-#ifdef __MSVCRT__
 extern double*	_imp___HUGE;
 #define	HUGE_VAL	(*_imp___HUGE)
-#else
-/* CRTDLL */
-extern double*	_imp___HUGE_dll;
-#define	HUGE_VAL	(*_imp___HUGE_dll)
-#endif
 
 #else /* __DECLSPEC_SUPPORTED */
 
-#ifdef __MSVCRT__
 __MINGW_IMPORT double	_HUGE;
 #define	HUGE_VAL	_HUGE
-#else
-/* CRTDLL */
-__MINGW_IMPORT double	_HUGE_dll;
-#define	HUGE_VAL	_HUGE_dll
-#endif
 
 #endif /* __DECLSPEC_SUPPORTED */
 #endif /* __MINGW_GNUC_PREREQ(3, 3) */
diff --git a/include/process.h b/include/process.h
index c8cbb1d..094e644 100644
--- a/include/process.h
+++ b/include/process.h
@@ -121,9 +121,6 @@ _CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wspawnvpe	(int, const wchar_t*, const
 #endif
 
 /*
- * The functions _beginthreadex and _endthreadex are not provided by CRTDLL.
- * They are provided by MSVCRT.
- *
  * NOTE: Apparently _endthread calls CloseHandle on the handle of the thread,
  * making for race conditions if you are not careful. Basically you have to
  * make sure that no-one is going to do *anything* with the thread handle
@@ -135,13 +132,10 @@ _CRTIMP unsigned long __cdecl __MINGW_NOTHROW
 	_beginthread	(void (*)(void *), unsigned, void*);
 _CRTIMP void __cdecl __MINGW_NOTHROW _endthread	(void);
 
-#ifdef	__MSVCRT__
 _CRTIMP unsigned long __cdecl __MINGW_NOTHROW
 	_beginthreadex	(void *, unsigned, unsigned (__stdcall *)

[MinGW-cvs] [git push mingw.org-wsl]Repository: mingw.org-wsl branch redo-filters updated. 4bb2b3ca71ced2f1f72184ca94d4c11c78daa753

From: Earnie B. <no...@so...> - 2012-09-10 17:37:58

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw.org-wsl".

The branch, redo-filters has been updated
       via  4bb2b3ca71ced2f1f72184ca94d4c11c78daa753 (commit)
      from  b6c47e8d8d31d487332e529437462f6ae957201d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw.org-wsl;a=commitdiff;h=

commit fd0c88828fac399eb5b703354584b6fdc03b8e93
Author: Earnie Boyd <ea...@us...>
Date:   Fri Sep 7 10:36:34 2012 -0400

    	Remove filters for CRTDLL and __MSVCRT__.
    
    	* Makefile.in: Remove -[DU]__MSVCRT__ and -[DU]__CRTDLL__.
    	* crt1.o: Remove CRTDLL specific target.
    	* dllcrt1.o: Ditto.
    	* gcrt1.o: Ditto.
    	* include/assert.h: Modify documentation to remove the use of CRTDLL.
    	* include/setjmp.h: Ditto.
    	* src/libcrt/crt/ofmt_stub.s: Ditto.
    	* include/ctype.h: Ditto.
    	Remove filters for __MSVCRT__ and unneeded #else coding.
    	* include/dirent.h: Ditto.
    	* include/dos.h: Ditto.
    	* include/io.h: Ditto.
    	* include/math.h: Ditto.
    	* include/process.h: Ditto.
    	* include/stdio.h: Ditto.
    	* include/stdlib.h: Ditto.
    	* include/string.h: Ditto.
    	* include/sys/stat.h: Ditto.
    	* include/sys/types.h: Ditto.
    	* include/sys/utime.h: Ditto.
    	* include/tchar.h: Ditto.
    	* include/time.h: Ditto.
    	* include/wchar.h: Ditto.
    	* include/wctype.h: Ditto.
    	* src/libcrt/crt/crt1.c: Ditto.
    	* src/libcrt/crt/init.c: Ditto.
    	* lib/lib32/moldname.def.in: Remove filters for __CRTDLL__.
    	* src/libcrt/tlssup.c: Remove filter for CRTDLL.

diff --git a/ChangeLog b/ChangeLog
index 456f89f..7f5dc47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,38 @@
 2012-09-07  Earnie Boyd  <ea...@us...>
 
+	Remove filters for CRTDLL and __MSVCRT__.
+
+	* Makefile.in: Remove -[DU]__MSVCRT__ and -[DU]__CRTDLL__.
+	* crt1.o: Remove CRTDLL specific target.
+	* dllcrt1.o: Ditto.
+	* gcrt1.o: Ditto.
+	* include/assert.h: Modify documentation to remove the use of CRTDLL.
+	* include/setjmp.h: Ditto.
+	* src/libcrt/crt/ofmt_stub.s: Ditto.
+	* include/ctype.h: Ditto.
+	Remove filters for __MSVCRT__ and unneeded #else coding.
+	* include/dirent.h: Ditto.
+	* include/dos.h: Ditto.
+	* include/io.h: Ditto.
+	* include/math.h: Ditto.
+	* include/process.h: Ditto.
+	* include/stdio.h: Ditto.
+	* include/stdlib.h: Ditto.
+	* include/string.h: Ditto.
+	* include/sys/stat.h: Ditto.
+	* include/sys/types.h: Ditto.
+	* include/sys/utime.h: Ditto.
+	* include/tchar.h: Ditto.
+	* include/time.h: Ditto.
+	* include/wchar.h: Ditto.
+	* include/wctype.h: Ditto.
+	* src/libcrt/crt/crt1.c: Ditto.
+	* src/libcrt/crt/init.c: Ditto.
+	* lib/lib32/moldname.def.in: Remove filters for __CRTDLL__.
+	* src/libcrt/tlssup.c: Remove filter for CRTDLL.
+
+2012-09-07  Earnie Boyd  <ea...@us...>
+
 	Apply LICENSE to all files as appropriate.
 
 	* tests/Makefile.in: Add file preamble.
diff --git a/Makefile.in b/Makefile.in
index 9a8d6e8..d32a229 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -626,7 +626,7 @@ $(msvcrt_DEF): lib/lib32/msvcrt.def.in
 	$(CC) -DRUNTIME=$(basename $(notdir $@)) \
 		-D__FILENAME__=$@ \
 		-D__$(basename $(notdir $@))__=1 \
-		-D__MSVCRT__ -C -E -P -xc-header \
+		-C -E -P -xc-header \
 		$? > $@
 
 
@@ -641,7 +641,7 @@ $(moldname_DEF): lib/lib32/moldname.def.in
 	$(CC) -DRUNTIME=$(basename $(notdir $@)) \
 		-D__FILENAME__=$$F \
 		-D__$(basename $(notdir $@))__=1 \
-		-D__MSVCRT__ -C -E -P -xc-header \
+		-C -E -P -xc-header \
 		$? > $@
 
 SRCDIR := lib/lib32
@@ -693,13 +693,9 @@ lib%.a: %.o
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 SRCDIR := src/libcrt/crt
-$(SRCDIR)/crt1.o $(SRCDIR)/dllcrt1.o:
-	$(MKDIR_P) $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $<
-
 $(SRCDIR)/crt2.o $(SRCDIR)/dllcrt2.o:
 	$(MKDIR_P) $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -D__MSVCRT__ -U__CRTDLL__ -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 $(SRCDIR)/crt1.o: $(SRCDIR)/crt1.c
 $(SRCDIR)/dllcrt1.o: $(SRCDIR)/dllcrt1.c
@@ -716,13 +712,9 @@ $(libscrnsavw_a_OBJECTS): $(libscrnsavw_a_SOURCES)
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $(scrnsavw_o_CFLAGS) -o $@ $<
 
 SRCDIR := misc/gpl/profile
-$(SRCDIR)/gcrt1.o:
-	mkdir -p $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $<
-
 $(SRCDIR)/gcrt2.o:
 	mkdir -p $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -D__MSVCRT__ -U__CRTDLL__ -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 $(SRCDIR)/gcrt1.o $(SRCDIR)/gcrt2.o: $(SRCDIR)/gcrt0.c
 
diff --git a/include/assert.h b/include/assert.h
index 1eddeed..6f9cdd0 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -53,7 +53,7 @@ extern "C" {
 #else /* debugging enabled */
 
 /*
- * CRTDLL nicely supplies a function which does the actual output and
+ * The runtime nicely supplies a function which does the actual output and
  * call to abort.
  */
 _CRTIMP void __cdecl __MINGW_NOTHROW _assert (const char*, const char*, int) __MINGW_ATTRIB_NORETURN;
diff --git a/include/ctype.h b/include/ctype.h
index 28ca1a9..e744a09 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -90,7 +90,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW toupper(int);
 
 /*
  * NOTE: The above are not old name type wrappers, but functions exported
- * explicitly by MSVCRT/CRTDLL. However, underscored versions are also
+ * explicitly by MSVCRT.DLL. However, underscored versions are also
  * exported.
  */
 #ifndef	__STRICT_ANSI__
@@ -105,22 +105,11 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int);
 /* Also defined in stdlib.h */
 #ifndef MB_CUR_MAX
 #ifdef __DECLSPEC_SUPPORTED
-# ifdef __MSVCRT__
-#  define MB_CUR_MAX __mb_cur_max
    __MINGW_IMPORT int __mb_cur_max;
-# else	/* not __MSVCRT */
-#  define MB_CUR_MAX __mb_cur_max_dll
-   __MINGW_IMPORT int __mb_cur_max_dll;
-# endif	/* not __MSVCRT */
-
+#  define MB_CUR_MAX __mb_cur_max
 #else		/* ! __DECLSPEC_SUPPORTED */
-# ifdef __MSVCRT__
    extern int* _imp____mb_cur_max;
 #  define MB_CUR_MAX (*_imp____mb_cur_max)
-# else		/* not __MSVCRT */
-   extern int*  _imp____mb_cur_max_dll;
-#  define MB_CUR_MAX (*_imp____mb_cur_max_dll)
-# endif 	/* not __MSVCRT */
 #endif  	/*  __DECLSPEC_SUPPORTED */
 #endif  /* MB_CUR_MAX */
 
@@ -129,25 +118,15 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int);
 # if __MSVCRT_VERSION__ <= 0x0700
   __MINGW_IMPORT unsigned short _ctype[];
 # endif
-# ifdef __MSVCRT__
   __MINGW_IMPORT unsigned short* _pctype;
-# else /* CRTDLL */
-  __MINGW_IMPORT unsigned short* _pctype_dll;
-# define  _pctype _pctype_dll
-# endif 
 
 #else		/*  __DECLSPEC_SUPPORTED */
 # if __MSVCRT_VERSION__ <= 0x0700
   extern unsigned short** _imp___ctype;
 # define _ctype (*_imp___ctype)
 # endif
-# ifdef __MSVCRT__
   extern unsigned short** _imp___pctype;
 # define _pctype (*_imp___pctype)
-# else /* CRTDLL */
-  extern unsigned short** _imp___pctype_dll;
-# define _pctype (*_imp___pctype_dll)
-# endif /* CRTDLL */
 #endif		/*  __DECLSPEC_SUPPORTED */
 
 /*
diff --git a/include/direct.h b/include/direct.h
index 149b8ed..5c576f5 100644
--- a/include/direct.h
+++ b/include/direct.h
@@ -68,13 +68,11 @@ _CRTIMP unsigned __cdecl __MINGW_NOTHROW _getdiskfree (unsigned, struct _diskfre
 
 #ifndef _WDIRECT_DEFINED
 /* wide character versions. Also in wchar.h */
-#ifdef __MSVCRT__ 
 _CRTIMP int __cdecl __MINGW_NOTHROW _wchdir(const wchar_t*);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetcwd(wchar_t*, int);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetdcwd(int, wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wmkdir(const wchar_t*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wrmdir(const wchar_t*);
-#endif	/* __MSVCRT__ */
 #define _WDIRECT_DEFINED
 #endif
 
diff --git a/include/dos.h b/include/dos.h
index 25d06d4..e2c629f 100644
--- a/include/dos.h
+++ b/include/dos.h
@@ -46,41 +46,6 @@
 extern "C" {
 #endif
 
-#ifndef __MSVCRT__ /* these are in CRTDLL, but not MSVCRT */
-#ifndef __DECLSPEC_SUPPORTED
-extern unsigned int *_imp___basemajor_dll;
-extern unsigned int *_imp___baseminor_dll;
-extern unsigned int *_imp___baseversion_dll;
-extern unsigned int *_imp___osmajor_dll;
-extern unsigned int *_imp___osminor_dll;
-extern unsigned int *_imp___osmode_dll;
-
-#define _basemajor (*_imp___basemajor_dll)
-#define _baseminor (*_imp___baseminor_dll)
-#define _baseversion (*_imp___baseversion_dll)
-#define _osmajor (*_imp___osmajor_dll)
-#define _osminor (*_imp___osminor_dll)
-#define _osmode (*_imp___osmode_dll)
-
-#else /* __DECLSPEC_SUPPORTED */
-
-__MINGW_IMPORT unsigned int _basemajor_dll;
-__MINGW_IMPORT unsigned int _baseminor_dll;
-__MINGW_IMPORT unsigned int _baseversion_dll;
-__MINGW_IMPORT unsigned int _osmajor_dll;
-__MINGW_IMPORT unsigned int _osminor_dll;
-__MINGW_IMPORT unsigned int _osmode_dll;
-
-#define _basemajor _basemajor_dll
-#define _baseminor _baseminor_dll
-#define _baseversion _baseversion_dll
-#define _osmajor _osmajor_dll
-#define _osminor _osminor_dll
-#define _osmode _osmode_dll
-
-#endif /* __DECLSPEC_SUPPORTED */
-#endif /* ! __MSVCRT__ */
-
 #ifndef _DISKFREE_T_DEFINED
 /* needed by _getdiskfree (also in direct.h) */
 struct _diskfree_t {
diff --git a/include/io.h b/include/io.h
index 521871e..77e4559 100644
--- a/include/io.h
+++ b/include/io.h
@@ -267,7 +267,6 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _mkdir (const char*);
 _CRTIMP char* __cdecl __MINGW_NOTHROW _mktemp (char*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _rmdir (const char*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _chmod (const char*, int);
-#ifdef __MSVCRT__
 _CRTIMP __int64 __cdecl __MINGW_NOTHROW _filelengthi64(int);
 #if __MSVCRT_VERSION__ < 0x0800
 _CRTIMP intptr_t __cdecl __MINGW_NOTHROW _findfirsti64(const char*, struct _finddatai64_t*);
@@ -306,8 +305,6 @@ __CRT_INLINE off64_t lseek64 (int fd, off64_t offset, int whence)
 }
 #endif
 
-#endif /* __MSVCRT__ */
-
 #ifndef _NO_OLDNAMES
 
 #ifndef _UWIN
@@ -398,9 +395,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _unlink (const char*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _write (int, const void*, unsigned int);
 
 /* Wide character versions. Also declared in wchar.h. */
-/* Not in crtdll.dll */
 #if !defined (_WIO_DEFINED)
-#if defined (__MSVCRT__)
 _CRTIMP int __cdecl __MINGW_NOTHROW _waccess(const wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wchmod(const wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wcreat(const wchar_t*, int);
@@ -441,7 +436,6 @@ _CRTALIAS intptr_t __cdecl __MINGW_NOTHROW _wfindfirsti64 (const wchar_t* _v1, s
 _CRTALIAS int  __cdecl __MINGW_NOTHROW	_wfindnexti64 (intptr_t _v1, struct _wfinddatai64_t* _v2)	 { return(_wfindnext32i64  (_v1,(struct _wfinddata32i64_t*)_v2)); }
 #endif /* !_USE_32BIT_TIME_T */
 #endif /* __MSVCRT_VERSION__ >= 0x0800 */
-#endif /* defined (__MSVCRT__) */
 #define _WIO_DEFINED
 #endif /* _WIO_DEFINED */
 
diff --git a/include/math.h b/include/math.h
index 03f6bd0..f286999 100644
--- a/include/math.h
+++ b/include/math.h
@@ -106,8 +106,6 @@ extern "C" {
  * __imp__HUGE is a pointer to the actual variable _HUGE in
  * MSVCRT.DLL. If we used _HUGE directly we would get a pointer
  * to a thunk function.
- *
- * NOTE: The CRTDLL version uses _HUGE_dll instead.
  */
 
 #if __MINGW_GNUC_PREREQ(3, 3)
@@ -116,25 +114,13 @@ extern "C" {
 
 #ifndef __DECLSPEC_SUPPORTED
 
-#ifdef __MSVCRT__
 extern double*	_imp___HUGE;
 #define	HUGE_VAL	(*_imp___HUGE)
-#else
-/* CRTDLL */
-extern double*	_imp___HUGE_dll;
-#define	HUGE_VAL	(*_imp___HUGE_dll)
-#endif
 
 #else /* __DECLSPEC_SUPPORTED */
 
-#ifdef __MSVCRT__
 __MINGW_IMPORT double	_HUGE;
 #define	HUGE_VAL	_HUGE
-#else
-/* CRTDLL */
-__MINGW_IMPORT double	_HUGE_dll;
-#define	HUGE_VAL	_HUGE_dll
-#endif
 
 #endif /* __DECLSPEC_SUPPORTED */
 #endif /* __MINGW_GNUC_PREREQ(3, 3) */
diff --git a/include/process.h b/include/process.h
index c8cbb1d..094e644 100644
--- a/include/process.h
+++ b/include/process.h
@@ -121,9 +121,6 @@ _CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wspawnvpe	(int, const wchar_t*, const
 #endif
 
 /*
- * The functions _beginthreadex and _endthreadex are not provided by CRTDLL.
- * They are provided by MSVCRT.
- *
  * NOTE: Apparently _endthread calls CloseHandle on the handle of the thread,
  * making for race conditions if you are not careful. Basically you have to
  * make sure that no-one is going to do *anything* with the thread handle
@@ -135,13 +132,10 @@ _CRTIMP unsigned long __cdecl __MINGW_NOTHROW
 	_beginthread	(void (*)(void *), unsigned, void*);
 _CRTIMP void __cdecl __MINGW_NOTHROW _endthread	(void);
 
-#ifdef	__MSVCRT__
 _CRTIMP unsigned long __cdecl __MINGW_NOTHROW
 	_beginthreadex	(void *, unsigned, unsigned (__stdcall *) (void *), 
 			 void*, unsigned, unsigned*);
 _CRTIMP void __cdecl __MINGW_NOTHROW _endthreadex (unsigned);
-#endif
-
 
 #ifndef	_NO_OLDNAMES
 /*
diff --git a/include/setjmp.h b/include/setjmp.h
index 0c694bb..ed5e802 100644
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -46,7 +46,7 @@ extern "C" {
 typedef _JBTYPE jmp_buf[_JBLEN];
 
 /*
- * The function provided by CRTDLL which appears to do the actual work
+ * The function provided by MSVCRT.DLL which appears to do the actual work
  * of setjmp.
  */
 _CRTIMP int __cdecl __MINGW_NOTHROW _setjmp (jmp_buf);
diff --git a/include/stdio.h b/include/stdio.h
index a6d7112..d81b29a 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -461,15 +461,10 @@ size_t __cdecl __MINGW_NOTHROW __mingw_fwrite (const void*, size_t, size_t, FILE
  * this type are unknown, but we (the compiler) need to know the size
  * because the programmer using fgetpos and fsetpos will be setting aside
  * storage for fpos_t structres. Actually I tested using a byte array and
- * it is fairly evident that the fpos_t type is a long (in CRTDLL.DLL).
- * Perhaps an unsigned long? TODO? It's definitely a 64-bit number in
+ * it is fairly evident that the fpos_t it's a 64-bit number in
  * MSVCRT however, and for now `long long' will do.
  */
-#ifdef __MSVCRT__
 typedef long long fpos_t;
-#else
-typedef long	fpos_t;
-#endif
 
 _CRTIMP int __cdecl __MINGW_NOTHROW	fgetpos	(FILE*, fpos_t*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	fsetpos (FILE*, const fpos_t*);
@@ -517,10 +512,8 @@ _CRTIMP FILE* __cdecl __MINGW_NOTHROW	_fdopen (int, const char*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	_fileno (FILE*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	_fcloseall (void);
 _CRTIMP FILE* __cdecl __MINGW_NOTHROW	_fsopen (const char*, const char*, int);
-#ifdef __MSVCRT__
 _CRTIMP int __cdecl __MINGW_NOTHROW	_getmaxstdio (void);
 _CRTIMP int __cdecl __MINGW_NOTHROW	_setmaxstdio (int);
-#endif
 
 #if __MSVCRT_VERSION__ >= 0x800
 _CRTIMP unsigned int __cdecl __MINGW_NOTHROW _get_output_format (void);
@@ -544,7 +537,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	fileno (FILE*);
 #define fileno(__F) ((__F)->_file)
 #endif
 
-#if defined (__MSVCRT__) && !defined (__NO_MINGW_LFS)
+#if !defined (__NO_MINGW_LFS)
 #include <sys/types.h>
 __CRT_INLINE FILE* __cdecl __MINGW_NOTHROW fopen64 (const char*, const char*);
 __CRT_INLINE FILE* __cdecl __MINGW_NOTHROW fopen64 (const char* filename, const char* mode)
@@ -557,7 +550,7 @@ int __cdecl __MINGW_NOTHROW fseeko64 (FILE*, off64_t, int);
 #ifdef __USE_MINGW_FSEEK
 int __cdecl __MINGW_NOTHROW __mingw_fseeko64 (FILE *, off64_t, int);
 #define fseeko64(fp, offset, whence)  __mingw_fseeko64(fp, offset, whence)
-#endif
+#endif /* __USER_MINGW_FSEEK */
 
 __CRT_INLINE off64_t __cdecl __MINGW_NOTHROW ftello64 (FILE *);
 __CRT_INLINE off64_t __cdecl __MINGW_NOTHROW ftello64 (FILE * stream)
@@ -596,7 +589,6 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	swprintf (wchar_t*, const wchar_t*, ...);
 _CRTIMP int __cdecl __MINGW_NOTHROW	vswprintf (wchar_t*, const wchar_t*, __VALIST);
 #endif
 
-#ifdef __MSVCRT__ 
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW fgetws (wchar_t*, int, FILE*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	fputws (const wchar_t*, FILE*);
 _CRTIMP wint_t __cdecl __MINGW_NOTHROW	getwc (FILE*);
@@ -619,7 +611,6 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	_wremove (const wchar_t*);
 _CRTIMP void __cdecl __MINGW_NOTHROW	_wperror (const wchar_t*);
 _CRTIMP FILE* __cdecl __MINGW_NOTHROW	_wpopen (const wchar_t*, const wchar_t*);
 #endif  /* __STRICT_ANSI__ */
-#endif	/* __MSVCRT__ */
 
 #ifndef __NO_ISOCEXT  /* externs in libmingwex.a */
 int __cdecl __MINGW_NOTHROW snwprintf (wchar_t* s, size_t n, const wchar_t*  format, ...);
@@ -640,11 +631,9 @@ int __cdecl __MINGW_NOTHROW vswscanf (const wchar_t * __restrict__,
 #endif /* _WSTDIO_DEFINED */
 
 #ifndef __STRICT_ANSI__
-#ifdef __MSVCRT__
 #ifndef NO_OLDNAMES
 _CRTIMP FILE* __cdecl __MINGW_NOTHROW	wpopen (const wchar_t*, const wchar_t*);
 #endif /* not NO_OLDNAMES */
-#endif /* MSVCRT runtime */
 
 /*
  * Other Non ANSI wide functions
diff --git a/include/stdlib.h b/include/stdlib.h
index 2105b86..d0b7cb8 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -86,7 +86,6 @@ extern int	_argc;
 extern char**	_argv;
 
 /* imports from runtime dll of the above variables */
-#ifdef __MSVCRT__
 
 extern int*  __cdecl __MINGW_NOTHROW   __p___argc(void);
 extern char*** __cdecl __MINGW_NOTHROW  __p___argv(void);
@@ -96,47 +95,17 @@ extern wchar_t***  __cdecl __MINGW_NOTHROW __p___wargv(void);
 #define __argv (*__p___argv())
 #define __wargv (*__p___wargv())
 
-#else /* !MSVCRT */
-
-#ifndef __DECLSPEC_SUPPORTED
-
-extern int*    _imp____argc_dll;
-extern char***  _imp____argv_dll;
-#define __argc (*_imp____argc_dll)
-#define __argv (*_imp____argv_dll)
-
-#else /* __DECLSPEC_SUPPORTED */
-
-__MINGW_IMPORT int    __argc_dll;
-__MINGW_IMPORT char**  __argv_dll;
-#define __argc __argc_dll
-#define __argv __argv_dll
-
-#endif /* __DECLSPEC_SUPPORTED */
-
-#endif /* __MSVCRT */
 #endif /* __STRICT_ANSI__ */
 /*
  * Also defined in ctype.h.
  */
 #ifndef MB_CUR_MAX
 #ifdef __DECLSPEC_SUPPORTED
-# ifdef __MSVCRT__
 #  define MB_CUR_MAX __mb_cur_max
    __MINGW_IMPORT int __mb_cur_max;
-# else		/* not __MSVCRT */
-#  define MB_CUR_MAX __mb_cur_max_dll
-   __MINGW_IMPORT int __mb_cur_max_dll;
-# endif		/* not __MSVCRT */
-
 #else		/* ! __DECLSPEC_SUPPORTED */
-# ifdef __MSVCRT__
    extern int* _imp____mb_cur_max;
 #  define MB_CUR_MAX (*_imp____mb_cur_max)
-# else		/* not __MSVCRT */
-   extern int*  _imp____mb_cur_max_dll;
-#  define MB_CUR_MAX (*_imp____mb_cur_max_dll)
-# endif 	/* not __MSVCRT */
 #endif  	/*  __DECLSPEC_SUPPORTED */
 #endif  /* MB_CUR_MAX */
 
@@ -159,24 +128,13 @@ extern int errno;
  * Use environ from the DLL, not as a global. 
  */
 
-#ifdef __MSVCRT__
   extern _CRTIMP char *** __cdecl __MINGW_NOTHROW __p__environ(void);
   extern _CRTIMP wchar_t *** __cdecl __MINGW_NOTHROW  __p__wenviron(void);
 # define _environ (*__p__environ())
 # define _wenviron (*__p__wenviron())
-#else /* ! __MSVCRT__ */
-# ifndef __DECLSPEC_SUPPORTED
-    extern char *** _imp___environ_dll;
-#   define _environ (*_imp___environ_dll)
-# else /* __DECLSPEC_SUPPORTED */
-    __MINGW_IMPORT char ** _environ_dll;
-#   define _environ _environ_dll
-# endif /* __DECLSPEC_SUPPORTED */
-#endif /* ! __MSVCRT__ */
 
 #define environ _environ
 
-#ifdef	__MSVCRT__
 /* One of the MSVCRTxx libraries */
 
 #ifndef __DECLSPEC_SUPPORTED
@@ -189,20 +147,6 @@ extern int errno;
 # endif /* _UWIN */
 #endif /* __DECLSPEC_SUPPORTED */
 
-#else /* ! __MSVCRT__ */
-
-/* CRTDLL run time library */
-
-#ifndef __DECLSPEC_SUPPORTED
-  extern int*	_imp___sys_nerr_dll;
-# define sys_nerr	(*_imp___sys_nerr_dll)
-#else /* __DECLSPEC_SUPPORTED */
-  __MINGW_IMPORT int	_sys_nerr_dll;
-# define sys_nerr	_sys_nerr_dll
-#endif /* __DECLSPEC_SUPPORTED */
-
-#endif /* ! __MSVCRT__ */
-
 #ifndef __DECLSPEC_SUPPORTED
 extern char***	_imp__sys_errlist;
 #define	sys_errlist	(*_imp___sys_errlist)
@@ -217,9 +161,6 @@ __MINGW_IMPORT char*	_sys_errlist[];
  * OS version and such constants.
  */
 
-#ifdef	__MSVCRT__
-/* msvcrtxx.dll */
-
 extern _CRTIMP unsigned __cdecl __MINGW_NOTHROW int*	__p__osver(void);
 extern _CRTIMP unsigned __cdecl __MINGW_NOTHROW int*	__p__winver(void);
 extern _CRTIMP unsigned __cdecl __MINGW_NOTHROW int*	__p__winmajor(void);
@@ -237,54 +178,13 @@ __MINGW_IMPORT unsigned int _winmajor;
 __MINGW_IMPORT unsigned int _winminor;
 #endif /* __DECLSPEC_SUPPORTED */
 
-#else
-/* Not msvcrtxx.dll, thus crtdll.dll */
-
-#ifndef __DECLSPEC_SUPPORTED
-
-extern unsigned int*	_imp___osver_dll;
-extern unsigned int*	_imp___winver_dll;
-extern unsigned int*	_imp___winmajor_dll;
-extern unsigned int*	_imp___winminor_dll;
-
-#define _osver		(*_imp___osver_dll)
-#define _winver		(*_imp___winver_dll)
-#define _winmajor	(*_imp___winmajor_dll)
-#define _winminor	(*_imp___winminor_dll)
-
-#else /* __DECLSPEC_SUPPORTED */
-
-__MINGW_IMPORT unsigned int	_osver_dll;
-__MINGW_IMPORT unsigned int	_winver_dll;
-__MINGW_IMPORT unsigned int	_winmajor_dll;
-__MINGW_IMPORT unsigned int	_winminor_dll;
-
-#define _osver		_osver_dll
-#define _winver		_winver_dll
-#define _winmajor	_winmajor_dll
-#define _winminor	_winminor_dll
 
-#endif /* __DECLSPEC_SUPPORTED */
-
-#endif
-
-#if defined  __MSVCRT__
 /* although the _pgmptr is exported as DATA,
  * be safe and use the access function __p__pgmptr() to get it. */
 _CRTIMP char** __cdecl __MINGW_NOTHROW __p__pgmptr(void);
 #define _pgmptr     (*__p__pgmptr())
 _CRTIMP wchar_t** __cdecl __MINGW_NOTHROW __p__wpgmptr(void);
 #define _wpgmptr    (*__p__wpgmptr())
-#else /* ! __MSVCRT__ */
-# ifndef __DECLSPEC_SUPPORTED
-  extern char** __imp__pgmptr_dll;
-# define _pgmptr (*_imp___pgmptr_dll)
-# else /* __DECLSPEC_SUPPORTED */
- __MINGW_IMPORT char* _pgmptr_dll;
-# define _pgmptr _pgmptr_dll
-# endif /* __DECLSPEC_SUPPORTED */
-/* no wide version in CRTDLL */
-#endif /* __MSVCRT__ */
 
 /*
  * This variable determines the default file mode.
@@ -292,23 +192,12 @@ _CRTIMP wchar_t** __cdecl __MINGW_NOTHROW __p__wpgmptr(void);
  */
 #if !defined (__DECLSPEC_SUPPORTED) || defined (__IN_MINGW_RUNTIME)
 
-#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 */
 
@@ -353,7 +242,6 @@ _CRTIMP double __cdecl __MINGW_NOTHROW	wcstod	(const wchar_t*, wchar_t**);
 float __cdecl __MINGW_NOTHROW wcstof( const wchar_t * __restrict__, wchar_t ** __restrict__);
 long double __cdecl __MINGW_NOTHROW wcstold (const wchar_t * __restrict__, wchar_t ** __restrict__);
 #endif /* __NO_ISOCEXT */
-#ifdef __MSVCRT__ 
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetenv(const wchar_t*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	_wputenv(const wchar_t*);
 _CRTIMP void __cdecl __MINGW_NOTHROW	_wsearchenv(const wchar_t*, const wchar_t*, wchar_t*);
@@ -361,7 +249,6 @@ _CRTIMP int __cdecl __MINGW_NOTHROW   	_wsystem(const wchar_t*);
 _CRTIMP void __cdecl __MINGW_NOTHROW    _wmakepath(wchar_t*, const wchar_t*, const wchar_t*, const wchar_t*, const wchar_t*);
 _CRTIMP void __cdecl __MINGW_NOTHROW	_wsplitpath (const wchar_t*, wchar_t*, wchar_t*, wchar_t*, wchar_t*);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW   _wfullpath (wchar_t*, const wchar_t*, size_t);
-#endif
 #define _WSTDLIB_DEFINED
 #endif
 
@@ -447,7 +334,6 @@ _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW  _itow (int, wchar_t*, int);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW  _ltow (long, wchar_t*, int);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW  _ultow (unsigned long, wchar_t*, int);
 
-#ifdef __MSVCRT__
 _CRTIMP __int64 __cdecl __MINGW_NOTHROW	_atoi64(const char *);
 _CRTIMP char* __cdecl __MINGW_NOTHROW	_i64toa(__int64, char *, int);
 _CRTIMP char* __cdecl __MINGW_NOTHROW	_ui64toa(unsigned __int64, char *, int);
@@ -493,7 +379,6 @@ typedef void
 _invalid_parameter_handler _set_invalid_parameter_handler (_invalid_parameter_handler);
 
 # endif /* __MSVCRT_VERSION__ >= 0x800 */
-#endif /* __MSVCRT__ */
 
 #ifndef	_NO_OLDNAMES
 
@@ -536,7 +421,6 @@ __CRT_INLINE long long __cdecl __MINGW_NOTHROW llabs(long long _j)
 long long  __cdecl __MINGW_NOTHROW strtoll (const char* __restrict__, char** __restrict, int);
 unsigned long long  __cdecl __MINGW_NOTHROW strtoull (const char* __restrict__, char** __restrict__, int);
 
-#if defined (__MSVCRT__) /* these are stubs for MS _i64 versions */ 
 long long  __cdecl __MINGW_NOTHROW atoll (const char *);
 
 #if !defined (__STRICT_ANSI__)
@@ -563,8 +447,6 @@ __CRT_INLINE wchar_t*  __cdecl __MINGW_NOTHROW ulltow (unsigned long long _n, wc
 #endif /* (__NO_INLINE__) */
 #endif /* (__STRICT_ANSI__)  */
 
-#endif /* __MSVCRT__ */
-
 #endif /* !__NO_ISOCEXT */
 
 
diff --git a/include/string.h b/include/string.h
index dfb9294..b530de5 100644
--- a/include/string.h
+++ b/include/string.h
@@ -73,7 +73,7 @@ _CRTIMP size_t __cdecl __MINGW_NOTHROW	strxfrm (char*, const char*, size_t);
 
 #ifndef __STRICT_ANSI__
 /*
- * Extra non-ANSI functions provided by the CRTDLL library
+ * Extra non-ANSI functions provided by the runtime library
  */
 _CRTIMP char* __cdecl __MINGW_NOTHROW	_strerror (const char *);
 _CRTIMP void* __cdecl __MINGW_NOTHROW	_memccpy (void*, const void*, int, size_t);
@@ -90,10 +90,8 @@ _CRTIMP char* __cdecl __MINGW_NOTHROW	_strset (char*, int);
 _CRTIMP char* __cdecl __MINGW_NOTHROW	_strupr (char*);
 _CRTIMP void __cdecl __MINGW_NOTHROW	_swab (const char*, char*, size_t);
 
-#ifdef __MSVCRT__
 _CRTIMP int __cdecl __MINGW_NOTHROW  _strncoll(const char*, const char*, size_t);
 _CRTIMP int __cdecl __MINGW_NOTHROW  _strnicoll(const char*, const char*, size_t);
-#endif
 
 #ifndef	_NO_OLDNAMES
 /*
@@ -156,11 +154,8 @@ _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW wcstok(wchar_t*, const wchar_t*);
 _CRTIMP size_t __cdecl __MINGW_NOTHROW	wcsxfrm(wchar_t*, const wchar_t*, size_t);
 
 #ifndef	__STRICT_ANSI__
-/*
- * Unicode versions of non-ANSI string functions provided by CRTDLL.
- */
 
-/* NOTE: _wcscmpi not provided by CRTDLL, this define is for portability */
+/* NOTE: _wcscmpi not provided by MSVCRT.DLL, this define is for portability */
 #define		_wcscmpi	_wcsicmp
 
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wcsdup (const wchar_t*);
@@ -173,14 +168,12 @@ _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wcsrev (wchar_t*);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wcsset (wchar_t*, wchar_t);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wcsupr (wchar_t*);
 
-#ifdef __MSVCRT__
 _CRTIMP int __cdecl __MINGW_NOTHROW  _wcsncoll(const wchar_t*, const wchar_t*, size_t);
 _CRTIMP int   __cdecl __MINGW_NOTHROW _wcsnicoll(const wchar_t*, const wchar_t*, size_t);
 #if __MSVCRT_VERSION__ >= 0x0700
 _CRTIMP  wchar_t* __cdecl __MINGW_NOTHROW _wcserror(int);
 _CRTIMP  wchar_t* __cdecl __MINGW_NOTHROW __wcserror(const wchar_t*);
 #endif
-#endif
 
 #ifndef	_NO_OLDNAMES
 /* NOTE: There is no _wcscmpi, but this is for compatibility. */
diff --git a/include/sys/stat.h b/include/sys/stat.h
index 1a22dfb..b39a792 100644
--- a/include/sys/stat.h
+++ b/include/sys/stat.h
@@ -130,7 +130,6 @@ struct stat
 };
 #endif /* _NO_OLDNAMES */
 
-#if defined (__MSVCRT__)
 struct _stati64 {
     _dev_t st_dev;
     _ino_t st_ino;
@@ -202,7 +201,6 @@ struct _stat64i32 {
 	__time64_t	st_ctime;
 };
 #endif /* __MSVCRT_VERSION__ >= 0x0800 */
-#endif /* __MSVCRT__ */
 #define _STAT_DEFINED
 #endif /* _STAT_DEFINED */
 
@@ -227,7 +225,6 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	stat (const char*, struct stat*);
 
 #endif	/* Not _NO_OLDNAMES */
 
-#if defined (__MSVCRT__)
 #if __MSVCRT_VERSION__ < 0x0800
 _CRTIMP int __cdecl __MINGW_NOTHROW  _fstati64(int, struct _stati64 *);
 _CRTIMP int __cdecl __MINGW_NOTHROW  _stati64(const char *, struct _stati64 *);
@@ -280,7 +277,6 @@ _CRTALIAS int __cdecl __MINGW_NOTHROW	_wstati64 (const wchar_t* _v1, struct _sta
 #endif /* __MSVCRT_VERSION__ >= 0x0800 */
 #define _WSTAT_DEFINED
 #endif /* _WSTAT_DEFIND */
-#endif /* __MSVCRT__ */
 
 #ifdef	__cplusplus
 }
diff --git a/include/sys/types.h b/include/sys/types.h
index 47cc3df..bb34549 100644
--- a/include/sys/types.h
+++ b/include/sys/types.h
@@ -72,11 +72,7 @@ typedef _off_t	off_t;
 
 #ifndef _DEV_T_
 #define	_DEV_T_
-#ifdef __MSVCRT__
 typedef unsigned int _dev_t;
-#else
-typedef short _dev_t;
-#endif
 
 #ifndef	_NO_OLDNAMES
 typedef _dev_t	dev_t;
diff --git a/include/sys/utime.h b/include/sys/utime.h
index dfbaefe..760ea5f 100644
--- a/include/sys/utime.h
+++ b/include/sys/utime.h
@@ -81,11 +81,9 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	_futime (int, struct _utimbuf*);
 
 /* The wide character version, only available for MSVCRT versions of the
  * C runtime library. */
-#ifdef __MSVCRT__
 #if __MSVCRT_VERSION__ < 0x0800
 _CRTIMP int __cdecl __MINGW_NOTHROW	_wutime (const wchar_t*, struct _utimbuf*);
 #endif
-#endif /* MSVCRT runtime */
 
 /* These require newer versions of msvcrt.dll (6.10 or higher).  */ 
 #if __MSVCRT_VERSION__ >= 0x0601
diff --git a/include/tchar.h b/include/tchar.h
index e72a8d8..5a4ef8c 100644
--- a/include/tchar.h
+++ b/include/tchar.h
@@ -179,9 +179,7 @@ typedef wchar_t _TCHAR;
 #define _wcsncnt(_wcs, _cnt) ((wcslen(_wcs)>_cnt) ? _count : wcslen(_wcs))
 #define _wcsspnp(_wcs1, _wcs2) ((*((_wcs1)+wcsspn(_wcs1,_wcs2))) ? ((_wcs1)+wcsspn(_wcs1,_wcs2)) : NULL)
 
-#if 1  /* defined __MSVCRT__ */
 /*
- *   These wide functions not in crtdll.dll.
  *   Define macros anyway so that _wfoo rather than _tfoo is undefined
  */
 #define _ttoi64     _wtoi64
@@ -262,7 +260,6 @@ typedef wchar_t _TCHAR;
 #define _tstat32i64	_wstat32i64
 #define _tstat64i32	_wstat64i32
 #endif /* __MSVCRT_VERSION__ > 0x0800 */
-#endif  /* __MSVCRT__ */
 
 /* dirent structures and functions */
 #define _tdirent	_wdirent
@@ -447,8 +444,6 @@ typedef char	_TCHAR;
 #define _trmdir	    _rmdir
 #define _tstat      _stat
 
-#if 1  /* defined __MSVCRT__ */
-/* Not in crtdll.dll. Define macros anyway? */
 #define _ttoi64     _atoi64
 #define _i64tot     _i64toa
 #define _ui64tot    _ui64toa
@@ -478,7 +473,6 @@ typedef char	_TCHAR;
 #define _tstat32i64	_stat32i64
 #define _tstat64i32	_stat64i32
 #endif /* __MSVCRT_VERSION__ > 0x0800 */
-#endif  /* __MSVCRT__ */
 
 /* dirent structures and functions */
 #define _tdirent	dirent
diff --git a/include/time.h b/include/time.h
index 8d463b0..ece1a94 100644
--- a/include/time.h
+++ b/include/time.h
@@ -194,7 +194,6 @@ _CRTALIAS struct tm*	   __cdecl __MINGW_NOTHROW	localtime (const time_t* _v)	  {
  * _tzname: standard/daylight savings time zone names (an array with two
  *          elements).
  */
-#ifdef __MSVCRT__
 
 /* These are for compatibility with pre-VC 5.0 suppied MSVCRT. */
 extern _CRTIMP int* __cdecl __MINGW_NOTHROW	__p__daylight (void);
@@ -205,62 +204,18 @@ __MINGW_IMPORT int	_daylight;
 __MINGW_IMPORT long	_timezone;
 __MINGW_IMPORT char 	*_tzname[2];
 
-#else /* not __MSVCRT (ie. crtdll) */
-
-#ifndef __DECLSPEC_SUPPORTED
-
-extern int*	_imp___daylight_dll;
-extern long*	_imp___timezone_dll;
-extern char**	_imp___tzname;
-
-#define _daylight	(*_imp___daylight_dll)
-#define _timezone	(*_imp___timezone_dll)
-#define _tzname		(*_imp___tzname)
-
-#else /* __DECLSPEC_SUPPORTED */
-
-__MINGW_IMPORT int	_daylight_dll;
-__MINGW_IMPORT long	_timezone_dll;
-__MINGW_IMPORT char*	_tzname[2];
-
-#define _daylight	_daylight_dll
-#define _timezone	_timezone_dll
-
-#endif /* __DECLSPEC_SUPPORTED */
-
-#endif /* not __MSVCRT__ */
-
 #endif	/* Not __STRICT_ANSI__ */
 
 #ifndef _NO_OLDNAMES
-
-#ifdef __MSVCRT__
-
 /* These go in the oldnames import library for MSVCRT. */
 __MINGW_IMPORT int	daylight;
 __MINGW_IMPORT long	timezone;
 __MINGW_IMPORT char 	*tzname[2];
-
-#else /* not __MSVCRT__ */
-
-/* CRTDLL is royally messed up when it comes to these macros.
-   TODO: import and alias these via oldnames import library instead 
-   of macros.  */
-
-#define daylight        _daylight
-/* NOTE: timezone not defined as macro because it would conflict with
-   struct timezone in sys/time.h.
-   Also, tzname used to a be macro, but now it's in moldname. */
-__MINGW_IMPORT char 	*tzname[2];
-
-#endif /* not __MSVCRT__ */
-
 #endif	/* Not _NO_OLDNAMES */
 
 #ifndef _WTIME_DEFINED
 /* wide function prototypes, also declared in wchar.h */
 #ifndef __STRICT_ANSI__
-#ifdef __MSVCRT__
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW	_wasctime(const struct tm*);
 #if __MSVCRT_VERSION__ < 0x0800
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW	_wctime(const time_t*);
@@ -278,7 +233,6 @@ _CRTALIAS wchar_t* __cdecl __MINGW_NOTHROW	_wctime (const time_t* _v) { return(_
 _CRTALIAS wchar_t* __cdecl __MINGW_NOTHROW	_wctime (const time_t* _v) { return(_wctime32 (_v)); }
 #endif
 #endif /* __MSVCRT_VERSION__ >= 0x0800 */
-#endif /*  __MSVCRT__ */
 #endif /* __STRICT_ANSI__ */
 _CRTIMP size_t __cdecl __MINGW_NOTHROW		wcsftime (wchar_t*, size_t, const wchar_t*, const struct tm*);
 #define _WTIME_DEFINED
diff --git a/include/wchar.h b/include/wchar.h
index fdf9728..54f0e51 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -126,7 +126,6 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	swprintf (wchar_t*, const wchar_t*, ...);
 _CRTIMP int __cdecl __MINGW_NOTHROW	vswprintf (wchar_t*, const wchar_t*, __VALIST);
 #endif
 
-#ifdef __MSVCRT__
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW fgetws (wchar_t*, int, FILE*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	fputws (const wchar_t*, FILE*);
 _CRTIMP wint_t __cdecl __MINGW_NOTHROW	getwc (FILE*);
@@ -147,7 +146,6 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	_wremove (const wchar_t*);
 _CRTIMP void __cdecl __MINGW_NOTHROW	_wperror (const wchar_t*);
 _CRTIMP FILE* __cdecl __MINGW_NOTHROW	_wpopen (const wchar_t*, const wchar_t*);
 #endif  /* __STRICT_ANSI__ */
-#endif	/* __MSVCRT__ */
 
 #ifndef __NO_ISOCEXT  /* externs in libmingwex.a */
 int __cdecl __MINGW_NOTHROW snwprintf (wchar_t*, size_t, const wchar_t*, ...);
@@ -175,7 +173,6 @@ _CRTIMP double __cdecl __MINGW_NOTHROW	wcstod (const wchar_t*, wchar_t**);
 float __cdecl __MINGW_NOTHROW wcstof (const wchar_t * __restrict__, wchar_t ** __restrict__);
 long double __cdecl __MINGW_NOTHROW wcstold (const wchar_t * __restrict__, wchar_t ** __restrict__);
 #endif /* __NO_ISOCEXT */
-#ifdef __MSVCRT__ 
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetenv(const wchar_t*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	_wputenv(const wchar_t*);
 _CRTIMP void __cdecl __MINGW_NOTHROW	_wsearchenv(const wchar_t*, const wchar_t*, wchar_t*);
@@ -183,7 +180,6 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	_wsystem(const wchar_t*);
 _CRTIMP void __cdecl __MINGW_NOTHROW	_wmakepath(wchar_t*, const wchar_t*, const wchar_t*, const wchar_t*, const wchar_t*);
 _CRTIMP void __cdecl __MINGW_NOTHROW	_wsplitpath (const wchar_t*, wchar_t*, wchar_t*, wchar_t*, wchar_t*);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wfullpath (wchar_t*, const wchar_t*, size_t);
-#endif
 _CRTIMP __int64 __cdecl _wcstoi64(const wchar_t *, wchar_t **, int);
 _CRTIMP __int64 __cdecl _wcstoi64_l(const wchar_t *, wchar_t **, int, _locale_t);
 _CRTIMP unsigned __int64 __cdecl _wcstoui64(const wchar_t *, wchar_t **, int);
@@ -193,7 +189,6 @@ _CRTIMP unsigned __int64 __cdecl _wcstoui64_l(const wchar_t *, wchar_t **, int,
 
 #ifndef _WTIME_DEFINED
 #ifndef __STRICT_ANSI__
-#ifdef __MSVCRT__
 /* wide function prototypes, also declared in time.h */
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW	_wasctime (const struct tm*);
 #if __MSVCRT_VERSION__ < 0x0800
@@ -213,7 +208,6 @@ _CRTALIAS wchar_t* __cdecl __MINGW_NOTHROW	_wctime (const time_t* _v)	{ return(_
 #endif
 #endif
 
-#endif /* __MSVCRT__ */
 #endif /* __STRICT_ANSI__ */
 _CRTIMP size_t __cdecl __MINGW_NOTHROW	wcsftime (wchar_t*, size_t, const wchar_t*, const struct tm*);
 #define _WTIME_DEFINED
@@ -244,11 +238,7 @@ _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW wcstok(wchar_t*, const wchar_t*);
 _CRTIMP size_t __cdecl __MINGW_NOTHROW	wcsxfrm(wchar_t*, const wchar_t*, size_t);
 
 #ifndef	__STRICT_ANSI__
-/*
- * Unicode versions of non-ANSI functions provided by CRTDLL.
- */
-
-/* NOTE: _wcscmpi not provided by CRTDLL, this define is for portability */
+/* NOTE: _wcscmpi not provided by runtime dll, this define is for portability */
 #define		_wcscmpi	_wcsicmp
 
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wcsdup (const wchar_t*);
@@ -261,14 +251,12 @@ _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wcsrev (wchar_t*);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wcsset (wchar_t*, wchar_t);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wcsupr (wchar_t*);
 
-#ifdef __MSVCRT__
 _CRTIMP int __cdecl __MINGW_NOTHROW  _wcsncoll(const wchar_t*, const wchar_t*, size_t);
 _CRTIMP int   __cdecl __MINGW_NOTHROW _wcsnicoll(const wchar_t*, const wchar_t*, size_t);
 #if __MSVCRT_VERSION__ >= 0x0700
 _CRTIMP  wchar_t* __cdecl __MINGW_NOTHROW _wcserror(int);
 _CRTIMP  wchar_t* __cdecl __MINGW_NOTHROW __wcserror(const wchar_t*);
 #endif
-#endif
 
 #ifndef	_NO_OLDNAMES
 /* NOTE: There is no _wcscmpi, but this is for compatibility. */
@@ -410,10 +398,7 @@ struct _wfinddata64i32_t {
 #endif
 
 /* Wide character versions. Also defined in io.h. */
-/* CHECK: I believe these only exist in MSVCRT, and not in CRTDLL. Also
-   applies to other wide character versions? */
 #if !defined (_WIO_DEFINED)
-#if defined (__MSVCRT__)
 #include <stdint.h>  /* For intptr_t.  */
 _CRTIMP int __cdecl __MINGW_NOTHROW	_waccess (const wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW	_wchmod (const wchar_t*, int);
@@ -455,19 +440,16 @@ _CRTALIAS int  __cdecl __MINGW_NOTHROW	_wfindnexti64 (long _v1, struct _wfinddat
 #endif /* !_USE_32BIT_TIME_T*/
 #endif /* __MSVCRT_VERSION__ >= 0x0800 */
 
-#endif /* defined (__MSVCRT__) */
 #define _WIO_DEFINED
 #endif /* _WIO_DEFINED */
 
 #ifndef _WDIRECT_DEFINED
 /* Also in direct.h */
-#ifdef __MSVCRT__
 _CRTIMP int __cdecl __MINGW_NOTHROW	  _wchdir (const wchar_t*);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW  _wgetcwd (wchar_t*, int);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW  _wgetdcwd (int, wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW	  _wmkdir (const wchar_t*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	  _wrmdir (const wchar_t*);
-#endif	/* __MSVCRT__ */
 #define _WDIRECT_DEFINED
 #endif /* _WDIRECT_DEFINED */
 
@@ -514,7 +496,6 @@ struct stat
 };
 #endif /* _NO_OLDNAMES */
 
-#if defined (__MSVCRT__)
 struct _stati64 {
     _dev_t st_dev;
     _ino_t st_ino;
@@ -589,13 +570,11 @@ struct _stat64i32 {
 };
 #endif /* __MSVCRT_VERSION__ >= 0x0800 */
 
-#endif  /* __MSVCRT__ */
 #define _STAT_DEFINED
 #endif /* _STAT_DEFINED */
 
 #if !defined ( _WSTAT_DEFINED)
 /* also declared in sys/stat.h */
-#if defined __MSVCRT__
 #if __MSVCRT_VERSION__ < 0x0800
 _CRTIMP int __cdecl __MINGW_NOTHROW	_wstat (const wchar_t*, struct _stat*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	_wstati64 (const wchar_t*, struct _stati64*);
@@ -615,7 +594,6 @@ _CRTALIAS int __cdecl __MINGW_NOTHROW	_wstat (const wchar_t* _v1, struct _stat*
 _CRTALIAS int __cdecl __MINGW_NOTHROW	_wstati64 (const wchar_t* _v1, struct _stati64* _v2) { return(_wstat32i64 (_v1,(struct _stat32i64*)_v2)); }
 #endif /* !_USE_32BIT_TIME_T */
 #endif /* __MSVCRT_VERSION__ >= 0x0800 */
-#endif  /* __MSVCRT__ */
 #define _WSTAT_DEFINED
 #endif /* ! _WSTAT_DEFIND  */
 
diff --git a/include/wctype.h b/include/wctype.h
index 786faf4..b65ef35 100644
--- a/include/wctype.h
+++ b/include/wctype.h
@@ -100,25 +100,14 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	isleadbyte (int);
 # if __MSVCRT_VERSION__ <= 0x0700
   __MINGW_IMPORT unsigned short _ctype[];
 # endif 
-# ifdef __MSVCRT__
   __MINGW_IMPORT unsigned short* _pctype;
-# else	/* CRTDLL */
-  __MINGW_IMPORT unsigned short* _pctype_dll;
-# define  _pctype _pctype_dll
-# endif
-
 #else		/* ! __DECLSPEC_SUPPORTED */
 # if __MSVCRT_VERSION__ <= 0x0700
   extern unsigned short** _imp___ctype;
 # define _ctype (*_imp___ctype)
 # endif
-# ifdef __MSVCRT__
   extern unsigned short** _imp___pctype;
 # define _pctype (*_imp___pctype)
-# else	/* CRTDLL */
-  extern unsigned short** _imp___pctype_dll;
-# define _pctype (*_imp___pctype_dll)
-# endif	/* CRTDLL */
 #endif		/*  __DECLSPEC_SUPPORTED */
 
 
diff --git a/lib/lib32/moldname.def.in b/lib/lib32/moldname.def.in
index b8bae6b..82d194b 100644
--- a/lib/lib32/moldname.def.in
+++ b/lib/lib32/moldname.def.in
@@ -31,9 +31,7 @@ chsize
 close
 creat
 cwait
-#if !(__CRTDLL__)
 daylight DATA
-#endif
 dup
 dup2
 ecvt
@@ -110,9 +108,7 @@ strupr
 swab
 tell
 tempnam
-#if  !(__CRTDLL__)
 timezone DATA
-#endif
 ; export tzname for both. See <time.h>
 tzname DATA
 tzset
@@ -129,9 +125,7 @@ wcsnset
 wcsrev
 wcsset
 wcsupr
-#if  !(__CRTDLL__)
 wpopen
-#endif
 write
 ; non-ANSI functions declared in math.h
 j0
diff --git a/src/libcrt/crt/crt1.c b/src/libcrt/crt/crt1.c
index ab73b50..424ed21 100644
--- a/src/libcrt/crt/crt1.c
+++ b/src/libcrt/crt/crt1.c
@@ -59,21 +59,17 @@ extern const PIMAGE_TLS_CALLBACK __dyn_tls_init_callback;
  * Must have the correct app type for MSVCRT. 
  */
 
-#ifdef __MSVCRT__
 #define __UNKNOWN_APP    0
 #define __CONSOLE_APP    1
 #define __GUI_APP        2
 __MINGW_IMPORT void __set_app_type(int);
-#endif /* __MSVCRT__ */
 
 /*  Global _fmode for this .exe, not the one in msvcrt.dll,
     The default is set in txtmode.o in libmingw32.a */
 /* Override the dllimport'd declarations in stdlib.h */
 #undef _fmode 
 extern int _fmode; 
-#ifdef __MSVCRT__
 extern int* __p__fmode(void); /* To access the dll _fmode */
-#endif
 
 /*
  * Setup the default file handles to have the _CRT_fmode mode, as well as
@@ -111,11 +107,7 @@ _mingw32_init_fmode (void)
     }
 
     /*  Now sync  the dll _fmode to the  one for this .exe.  */
-#ifdef __MSVCRT__
     *__p__fmode() = _fmode;	
-#else
-    *_imp___fmode_dll = _fmode;
-#endif
 }
 
 /* This function will be called when a trap occurs. Thanks to Jacob
@@ -276,9 +268,7 @@ __mingw_CRTStartup (void)
 void
 mainCRTStartup (void)
 {
-#ifdef __MSVCRT__
   __set_app_type (__CONSOLE_APP);
-#endif
   __mingw_CRTStartup ();
 }
 
@@ -290,9 +280,7 @@ mainCRTStartup (void)
 void
 WinMainCRTStartup (void)
 {
-#ifdef __MSVCRT__
   __set_app_type (__GUI_APP);
-#endif
   __mingw_CRTStartup ();
 }
 
diff --git a/src/libcrt/crt/init.c b/src/libcrt/crt/init.c
index 61522b0..01230bd 100644
--- a/src/libcrt/crt/init.c
+++ b/src/libcrt/crt/init.c
@@ -48,14 +48,10 @@ char **_argv = 0;
  */
 extern int _CRT_glob;
 
-#ifdef __MSVCRT__
 typedef struct {
   int newmode;
 } _startupinfo;
 extern void __getmainargs (int *, char ***, char ***, int, _startupinfo *);
-#else
-extern void __GetMainArgs (int *, char ***, char ***, int);
-#endif
 
 /*
  * Initialize the _argc, _argv and environ variables.
@@ -66,20 +62,13 @@ _mingw32_init_mainargs ()
   /* The environ variable is provided directly in stdlib.h through
    * a dll function call. */
   char **dummy_environ;
-#ifdef __MSVCRT__
   _startupinfo start_info;
   start_info.newmode = 0;
-#endif
 
   /*
    * Microsoft's runtime provides a function for doing just that.
    */
-#ifdef __MSVCRT__
   (void) __getmainargs (&_argc, &_argv, &dummy_environ, _CRT_glob, 
                         &start_info);
-#else
-  /* CRTDLL version */
-  (void) __GetMainArgs (&_argc, &_argv, &dummy_environ, _CRT_glob);
-#endif
 }
 
diff --git a/src/libcrt/crt/ofmt_stub.s b/src/libcrt/crt/ofmt_stub.s
index 3f797b4..d8b97b1 100644
--- a/src/libcrt/crt/ofmt_stub.s
+++ b/src/libcrt/crt/ofmt_stub.s
@@ -30,7 +30,6 @@
  * versions of MSVCRT, (those which do not already advertise availability of
  * any exported _get_output_format() function); this will permit _pformat()
  * to transparently interoperate with all supported versions of MSVCRT.
- * (Likewise for CRTDLL).
  */
 	.text
 	.p2align 1,,4
diff --git a/src/libcrt/crt/tlssup.c b/src/libcrt/crt/tlssup.c
index 2141b2e..9f1225b 100644
--- a/src/libcrt/crt/tlssup.c
+++ b/src/libcrt/crt/tlssup.c
@@ -21,10 +21,6 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#ifdef CRTDLL
-#undef CRTDLL
-#endif
-
 #include <windows.h>
 #include <stdio.h>
 #include <memory.h>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog           |   67 ++++++++++++++++++++++
 include/_mingw.h    |    2 +
 include/commdlg.h   |  158 ++++++++++++++++++++-------------------------------
 include/complex.h   |    7 --
 include/conio.h     |    4 +-
 include/control.h   |    1 +
 include/cpl.h       |   13 ++--
 include/cplext.h    |    1 +
 include/ctype.h     |    4 +-
 include/custcntl.h  |   24 +++-----
 include/dbt.h       |   39 +++++--------
 include/dde.h       |    1 +
 include/ddeml.h     |   38 ++++--------
 include/devguid.h   |    1 +
 include/dhcpcsdk.h  |    5 +-
 include/direct.h    |    2 -
 include/dirent.h    |    2 -
 include/dlgs.h      |    1 +
 include/docobj.h    |    1 +
 include/dos.h       |    4 +-
 include/dsadmin.h   |    5 +-
 include/dsclient.h  |   20 ++-----
 include/dsgetdc.h   |   17 ++----
 include/dshow.h     |    1 +
 include/dsquery.h   |    5 +-
 include/dsrole.h    |    5 +-
 include/dvdevcod.h  |    1 +
 include/dvdmedia.h  |    1 +
 include/edevdefs.h  |    1 +
 include/errno.h     |    4 +-
 include/errorrep.h  |   14 +----
 include/errors.h    |    7 +--
 include/evcode.h    |    1 +
 include/excpt.h     |    4 +-
 include/exdisp.h    |    1 +
 include/exdispid.h  |    1 +
 include/fcntl.h     |   16 ++---
 include/fenv.h      |    1 -
 include/float.h     |    4 +-
 include/fltdefs.h   |    5 +-
 include/getopt.h    |    4 +-
 include/httpext.h   |    1 +
 include/sdkddkver.h |    3 +
 43 files changed, 236 insertions(+), 261 deletions(-)


hooks/post-receive
-- 
Repository: mingw.org-wsl

[MinGW-cvs] [git push mingw-get]Repository: mingw-get branch master updated. r0-5-beta-20120426-1-20-gaed3212

From: Keith M. <no...@so...> - 2012-09-09 19:42:30

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw-get".

The branch, master has been updated
       via  aed3212803129a9cb08b9f112ea43eb5e1eb11be (commit)
       via  1b9b58a07b284d134757b2f7f097c5968c23d06d (commit)
      from  23a9aa1b7d3259b5122c13365cc53637555be4ca (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw-get;a=commitdiff;h=

commit aed3212803129a9cb08b9f112ea43eb5e1eb11be
Author: Keith Marshall <kei...@us...>
Date:   Sun Sep 9 20:39:39 2012 +0100

    Fix typo, and update licensing terms for embedded getopt.c

diff --git a/ChangeLog b/ChangeLog
index 72ed472..7ebb5a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-09-09  Keith Marshall  <kei...@us...>
+
+	Fix typo, and update licensing terms for embedded getopt.c
+
+	* src/getopt.c: Incorporate MIT/X style licence; update copyright
+	notice, to reflect chronology of publication; correct degenerate RCS
+	keyword usage in EOF marker comment.
+
 2012-09-03  Keith Marshall  <kei...@us...>
 
 	Correct omission from copyright notice.
diff --git a/src/getopt.c b/src/getopt.c
index e5bcbad..dc0637e 100644
--- a/src/getopt.c
+++ b/src/getopt.c
@@ -8,25 +8,33 @@
  *
  * This file is part of the MinGW32 package set.
  *
- * Contributed by Keith Marshall <kei...@us...>
+ * Written by Keith Marshall <kei...@us...>
+ * Copyright (C) 2008, 2009, 2011, 2012, MinGW.org Project.
  *
+ * ---------------------------------------------------------------------------
  *
- * THIS SOFTWARE IS NOT COPYRIGHTED
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
  *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
+ * The above copyright notice, this permission notice, and the following
+ * disclaimer shall be included in all copies or substantial portions of
+ * the Software.
  *
- * 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.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
  *
- * $Revision$
- * $Author$
- * $Date$
+ * ---------------------------------------------------------------------------
  *
  */
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -781,4 +789,4 @@ __weak_alias( getopt_long, _getopt_long )
 __weak_alias( getopt_long_only, _getopt_long_only )
 #endif
 
-/* $RCSfile$Revision: 1.9 $: end of file */
+/* $RCSfile$: end of file */

http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw-get;a=commitdiff;h=

commit aed3212803129a9cb08b9f112ea43eb5e1eb11be
Author: Keith Marshall <kei...@us...>
Date:   Sun Sep 9 20:39:39 2012 +0100

    Fix typo, and update licensing terms for embedded getopt.c

diff --git a/ChangeLog b/ChangeLog
index 72ed472..7ebb5a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-09-09  Keith Marshall  <kei...@us...>
+
+	Fix typo, and update licensing terms for embedded getopt.c
+
+	* src/getopt.c: Incorporate MIT/X style licence; update copyright
+	notice, to reflect chronology of publication; correct degenerate RCS
+	keyword usage in EOF marker comment.
+
 2012-09-03  Keith Marshall  <kei...@us...>
 
 	Correct omission from copyright notice.
diff --git a/src/getopt.c b/src/getopt.c
index e5bcbad..dc0637e 100644
--- a/src/getopt.c
+++ b/src/getopt.c
@@ -8,25 +8,33 @@
  *
  * This file is part of the MinGW32 package set.
  *
- * Contributed by Keith Marshall <kei...@us...>
+ * Written by Keith Marshall <kei...@us...>
+ * Copyright (C) 2008, 2009, 2011, 2012, MinGW.org Project.
  *
+ * ---------------------------------------------------------------------------
  *
- * THIS SOFTWARE IS NOT COPYRIGHTED
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
  *
- * This source code is offered for use in the public domain. You may
- * use, modify or distribute it freely.
+ * The above copyright notice, this permission notice, and the following
+ * disclaimer shall be included in all copies or substantial portions of
+ * the Software.
  *
- * 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.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
  *
- * $Revision$
- * $Author$
- * $Date$
+ * ---------------------------------------------------------------------------
  *
  */
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -781,4 +789,4 @@ __weak_alias( getopt_long, _getopt_long )
 __weak_alias( getopt_long_only, _getopt_long_only )
 #endif
 
-/* $RCSfile$Revision: 1.9 $: end of file */
+/* $RCSfile$: end of file */

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog     |   16 ++++++++++++++++
 build-aux     |    1 -
 src/getopt.c  |   34 +++++++++++++++++++++-------------
 src/pkgkeys.c |    2 +-
 4 files changed, 38 insertions(+), 15 deletions(-)
 delete mode 160000 build-aux


hooks/post-receive
-- 
Repository: mingw-get

[MinGW-cvs] [git push mingw-dist]Repository: mingw-dist branch master updated. 3ab06257ec2058440bd28fea4305f051e89bad65

From: Erwin W. <no...@so...> - 2012-09-09 11:17:56

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw-dist".

The branch, master has been updated
       via  3ab06257ec2058440bd28fea4305f051e89bad65 (commit)
      from  f6e5af7ea2e7318c1465cb60720860f51637f80a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw-dist;a=commitdiff;h=

commit 3ab06257ec2058440bd28fea4305f051e89bad65
Author: U-erwin2\waterlan <waterlan@erwin2.(none)>
Date:   Sun Sep 9 13:17:31 2012 +0200

    dos2unix update

diff --git a/mingw32/issue.log b/mingw32/issue.log
old mode 100644
new mode 100755
index 26f2262..4337dd1
--- a/mingw32/issue.log
+++ b/mingw32/issue.log
@@ -31,7 +31,7 @@
   2e422f7ef9f923561a038da518a872532900e13a 2011120300 mingw32-binutils.xml
   b4c60a4702749a0369b5059e7c1f50ce567e2c95 2012073100 mingw32-bzip2.xml
   c2fa4fe580615c774f72216fb06e35a909a08ba6 2012040200 mingw32-cygutils.xml
-  8a3de598c63b7b33c73830627bb20a62fa99d23b 2012073100 mingw32-dos2unix.xml
+  def4cf3df5f61690f8bfc409727e80480336bcfa 2012090900 mingw32-dos2unix.xml
   a95192db0a6f7de983c642096ce2a335dcad8393 2012073100 mingw32-expat.xml
   bc4b331f9bdfbf72a11a310fbc17a027396d09d5 2012073100 mingw32-gcc-tools.xml
   9d1d9deeccee4fb04f2944e3cd5e7b85757308ce 2011050500 mingw32-gcc3.xml
diff --git a/msys/issue.log b/msys/issue.log
old mode 100644
new mode 100755
index a4d786d..f00a5a3
--- a/msys/issue.log
+++ b/msys/issue.log
@@ -41,7 +41,7 @@
   000b65b5e1d1c9a0bf3fcb08e08d73cd952f3963 2012073100 msys-dash.xml
   dcce1ddf19a9c305adb350e958de55676cf69112 2012073100 msys-diffstat.xml
   5cc54287970aca239fc154e9b46c988ef57b5c9a 2012073100 msys-diffutils.xml
-  ed6f606ed7a71b8327f63c2f6297ef868fb62562 2012073100 msys-dos2unix.xml
+  159b80a274cfd8cca4f2e3fac0c3ab562592de79 2012090900 msys-dos2unix.xml
   2654c6f215facbc7aa9a7391a76e9f626ee2188c 2012073100 msys-expat.xml
   2a9bc928f054128d683e2f07e11aa5c73271eb82 2012073100 msys-file.xml
   43501d0b51f801f6ee2b124c361b20223fcfeff2 2012073100 msys-findutils.xml

-----------------------------------------------------------------------

Summary of changes:
 mingw32/issue.log |    2 +-
 msys/issue.log    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 mingw32/issue.log
 mode change 100644 => 100755 msys/issue.log


hooks/post-receive
-- 
Repository: mingw-dist

[MinGW-cvs] [git push mingw-dist]Repository: mingw-dist branch master updated. f6e5af7ea2e7318c1465cb60720860f51637f80a

From: Erwin W. <no...@so...> - 2012-09-09 09:17:14

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw-dist".

The branch, master has been updated
       via  f6e5af7ea2e7318c1465cb60720860f51637f80a (commit)
      from  1d84d8249adac6415846a4529422ebe67e42e9e9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw-dist;a=commitdiff;h=

commit f6e5af7ea2e7318c1465cb60720860f51637f80a
Author: U-erwin2\waterlan <waterlan@erwin2.(none)>
Date:   Sun Sep 9 11:16:49 2012 +0200

    changes for dos2unix 6.0.2

diff --git a/ChangeLog b/ChangeLog
old mode 100644
new mode 100755
index 09db453..e638bde
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-09  Erwin Waterlander  <wat...@xs...>
+	* mingw32/mingw32-dos2unix.xml: Updated for dos2unix version 6.0.2.
+	* msys/msys-dos2unix.xml: Updated for dos2unix version 6.0.2.
+
 2012-09-07  Keith Marshall  <kei...@us...>
 
 	Add support files for git and Mercurial.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 ChangeLog


hooks/post-receive
-- 
Repository: mingw-dist

[MinGW-cvs] [git push mingw-dist]Repository: mingw-dist branch master updated. 1d84d8249adac6415846a4529422ebe67e42e9e9

From: Erwin W. <no...@so...> - 2012-09-09 06:59:38

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw-dist".

The branch, master has been updated
       via  1d84d8249adac6415846a4529422ebe67e42e9e9 (commit)
      from  137771e800d6376511bd12e9743a3001c5be45bd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw-dist;a=commitdiff;h=

commit 1d84d8249adac6415846a4529422ebe67e42e9e9
Author: U-erwin2\waterlan <waterlan@erwin2.(none)>
Date:   Sun Sep 9 08:58:57 2012 +0200

    update dos2unix packages

diff --git a/mingw32/mingw32-dos2unix.xml b/mingw32/mingw32-dos2unix.xml
old mode 100644
new mode 100755
index b0c3ef0..b854550
--- a/mingw32/mingw32-dos2unix.xml
+++ b/mingw32/mingw32-dos2unix.xml
@@ -19,6 +19,18 @@
       <source tarname="dos2unix-%-mingw32-%-src.tar.%" />
 
       <component class="bin">
+        <release tarname="dos2unix-6.0.2-1-mingw32-bin.tar.lzma" >
+          <requires eq="mingw32-libiconv-*-mingw32-*-dll-2.tar" />
+          <requires eq="mingw32-libintl-*-mingw32-*-dll-8.tar" />
+        </release>
+        <release tarname="dos2unix-6.0.1-1-mingw32-bin.tar.lzma" >
+          <requires eq="mingw32-libiconv-*-mingw32-*-dll-2.tar" />
+          <requires eq="mingw32-libintl-*-mingw32-*-dll-8.tar" />
+        </release>
+        <release tarname="dos2unix-6.0-1-mingw32-bin.tar.lzma" >
+          <requires eq="mingw32-libiconv-*-mingw32-*-dll-2.tar" />
+          <requires eq="mingw32-libintl-*-mingw32-*-dll-8.tar" />
+        </release>
         <release tarname="dos2unix-5.3.3-1-mingw32-bin.tar.lzma" >
           <requires eq="mingw32-libiconv-*-mingw32-*-dll-2.tar" />
           <requires eq="mingw32-libintl-*-mingw32-*-dll-8.tar" />
@@ -31,6 +43,9 @@
       </component>
 
       <component class="doc">
+        <release tarname="dos2unix-6.0.2-1-mingw32-doc.tar.lzma" />
+        <release tarname="dos2unix-6.0.1-1-mingw32-doc.tar.lzma" />
+        <release tarname="dos2unix-6.0-1-mingw32-doc.tar.lzma" />
         <release tarname="dos2unix-5.3.3-1-mingw32-doc.tar.lzma" />
         <release tarname="cygutils-1.3.4-1-mingw32-doc.tar.lzma">
           <licence tarname="cygutils-%-mingw32-%-lic.tar.%" />
@@ -39,6 +54,9 @@
       </component>
 
       <component class="lic">
+        <release tarname="dos2unix-6.0.2-1-mingw32-lic.tar.lzma" />
+        <release tarname="dos2unix-6.0.1-1-mingw32-lic.tar.lzma" />
+        <release tarname="dos2unix-6.0-1-mingw32-lic.tar.lzma" />
         <release tarname="dos2unix-5.3.3-1-mingw32-lic.tar.lzma" />
         <release tarname="cygutils-1.3.4-1-mingw32-lic.tar.lzma">
           <licence tarname="cygutils-%-mingw32-%-lic.tar.%" />
diff --git a/msys/msys-dos2unix.xml b/msys/msys-dos2unix.xml
old mode 100644
new mode 100755
index 4daba96..3a0a768
--- a/msys/msys-dos2unix.xml
+++ b/msys/msys-dos2unix.xml
@@ -20,6 +20,21 @@
       <source tarname="dos2unix-%-msys-%-src.tar.%" />
 
       <component class="bin">
+        <release tarname="dos2unix-6.0.2-1-msys-1.0.17-bin.tar.lzma" >
+          <requires eq="msys-core-*-msys-*-bin.tar" />
+          <requires eq="msys-libiconv-*-msys-*-dll-2.tar" />
+          <requires eq="msys-libintl-*-msys-*-dll-8.tar" />
+        </release>
+        <release tarname="dos2unix-6.0.1-1-msys-1.0.17-bin.tar.lzma" >
+          <requires eq="msys-core-*-msys-*-bin.tar" />
+          <requires eq="msys-libiconv-*-msys-*-dll-2.tar" />
+          <requires eq="msys-libintl-*-msys-*-dll-8.tar" />
+        </release>
+        <release tarname="dos2unix-6.0-1-msys-1.0.17-bin.tar.lzma" >
+          <requires eq="msys-core-*-msys-*-bin.tar" />
+          <requires eq="msys-libiconv-*-msys-*-dll-2.tar" />
+          <requires eq="msys-libintl-*-msys-*-dll-8.tar" />
+        </release>
         <release tarname="dos2unix-5.3.3-1-msys-1.0.17-bin.tar.lzma" >
           <requires eq="msys-core-*-msys-*-bin.tar" />
           <requires eq="msys-libiconv-*-msys-*-dll-2.tar" />
@@ -33,6 +48,9 @@
       </component>
 
       <component class="doc">
+        <release tarname="dos2unix-6.0.2-1-msys-1.0.17-doc.tar.lzma" />
+        <release tarname="dos2unix-6.0.1-1-msys-1.0.17-doc.tar.lzma" />
+        <release tarname="dos2unix-6.0-1-msys-1.0.17-doc.tar.lzma" />
         <release tarname="dos2unix-5.3.3-1-msys-1.0.17-doc.tar.lzma" />
         <release tarname="cygutils-dos2unix-1.3.4-4-msys-1.0.13-doc.tar.lzma">
           <download tarname="none" />
@@ -43,6 +61,9 @@
       </component>
 
       <component class="lic">
+        <release tarname="dos2unix-6.0.2-1-msys-1.0.17-lic.tar.lzma" />
+        <release tarname="dos2unix-6.0.1-1-msys-1.0.17-lic.tar.lzma" />
+        <release tarname="dos2unix-6.0-1-msys-1.0.17-lic.tar.lzma" />
         <release tarname="dos2unix-5.3.3-1-msys-1.0.17-lic.tar.lzma" />
         <release tarname="cygutils-dos2unix-1.3.4-4-msys-1.0.13-lic.tar.lzma">
           <download tarname="none" />

-----------------------------------------------------------------------

Summary of changes:
 mingw32/mingw32-dos2unix.xml |   18 ++++++++++++++++++
 msys/msys-dos2unix.xml       |   21 +++++++++++++++++++++
 2 files changed, 39 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 mingw32/mingw32-dos2unix.xml
 mode change 100644 => 100755 msys/msys-dos2unix.xml


hooks/post-receive
-- 
Repository: mingw-dist

[MinGW-cvs] [git push mingw.org-wsl]Repository: mingw.org-wsl branch redo-filters updated. b6c47e8d8d31d487332e529437462f6ae957201d

From: Earnie B. <no...@so...> - 2012-09-08 19:14:56

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw.org-wsl".

The branch, redo-filters has been updated
       via  b6c47e8d8d31d487332e529437462f6ae957201d (commit)
      from  5567112e48461df58aa06fdfed7ca45a0ff450b9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw.org-wsl;a=commitdiff;h=

commit fd0c88828fac399eb5b703354584b6fdc03b8e93
Author: Earnie Boyd <ea...@us...>
Date:   Fri Sep 7 10:36:34 2012 -0400

    	Remove filters for CRTDLL and __MSVCRT__.
    
    	* Makefile.in: Remove -[DU]__MSVCRT__ and -[DU]__CRTDLL__.
    	* crt1.o: Remove CRTDLL specific target.
    	* dllcrt1.o: Ditto.
    	* gcrt1.o: Ditto.
    	* include/assert.h: Modify documentation to remove the use of CRTDLL.
    	* include/setjmp.h: Ditto.
    	* src/libcrt/crt/ofmt_stub.s: Ditto.
    	* include/ctype.h: Ditto.
    	Remove filters for __MSVCRT__ and unneeded #else coding.
    	* include/dirent.h: Ditto.
    	* include/dos.h: Ditto.
    	* include/io.h: Ditto.
    	* include/math.h: Ditto.
    	* include/process.h: Ditto.
    	* include/stdio.h: Ditto.
    	* include/stdlib.h: Ditto.
    	* include/string.h: Ditto.
    	* include/sys/stat.h: Ditto.
    	* include/sys/types.h: Ditto.
    	* include/sys/utime.h: Ditto.
    	* include/tchar.h: Ditto.
    	* include/time.h: Ditto.
    	* include/wchar.h: Ditto.
    	* include/wctype.h: Ditto.
    	* src/libcrt/crt/crt1.c: Ditto.
    	* src/libcrt/crt/init.c: Ditto.
    	* lib/lib32/moldname.def.in: Remove filters for __CRTDLL__.
    	* src/libcrt/tlssup.c: Remove filter for CRTDLL.

diff --git a/ChangeLog b/ChangeLog
index 456f89f..7f5dc47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,38 @@
 2012-09-07  Earnie Boyd  <ea...@us...>
 
+	Remove filters for CRTDLL and __MSVCRT__.
+
+	* Makefile.in: Remove -[DU]__MSVCRT__ and -[DU]__CRTDLL__.
+	* crt1.o: Remove CRTDLL specific target.
+	* dllcrt1.o: Ditto.
+	* gcrt1.o: Ditto.
+	* include/assert.h: Modify documentation to remove the use of CRTDLL.
+	* include/setjmp.h: Ditto.
+	* src/libcrt/crt/ofmt_stub.s: Ditto.
+	* include/ctype.h: Ditto.
+	Remove filters for __MSVCRT__ and unneeded #else coding.
+	* include/dirent.h: Ditto.
+	* include/dos.h: Ditto.
+	* include/io.h: Ditto.
+	* include/math.h: Ditto.
+	* include/process.h: Ditto.
+	* include/stdio.h: Ditto.
+	* include/stdlib.h: Ditto.
+	* include/string.h: Ditto.
+	* include/sys/stat.h: Ditto.
+	* include/sys/types.h: Ditto.
+	* include/sys/utime.h: Ditto.
+	* include/tchar.h: Ditto.
+	* include/time.h: Ditto.
+	* include/wchar.h: Ditto.
+	* include/wctype.h: Ditto.
+	* src/libcrt/crt/crt1.c: Ditto.
+	* src/libcrt/crt/init.c: Ditto.
+	* lib/lib32/moldname.def.in: Remove filters for __CRTDLL__.
+	* src/libcrt/tlssup.c: Remove filter for CRTDLL.
+
+2012-09-07  Earnie Boyd  <ea...@us...>
+
 	Apply LICENSE to all files as appropriate.
 
 	* tests/Makefile.in: Add file preamble.
diff --git a/Makefile.in b/Makefile.in
index 9a8d6e8..d32a229 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -626,7 +626,7 @@ $(msvcrt_DEF): lib/lib32/msvcrt.def.in
 	$(CC) -DRUNTIME=$(basename $(notdir $@)) \
 		-D__FILENAME__=$@ \
 		-D__$(basename $(notdir $@))__=1 \
-		-D__MSVCRT__ -C -E -P -xc-header \
+		-C -E -P -xc-header \
 		$? > $@
 
 
@@ -641,7 +641,7 @@ $(moldname_DEF): lib/lib32/moldname.def.in
 	$(CC) -DRUNTIME=$(basename $(notdir $@)) \
 		-D__FILENAME__=$$F \
 		-D__$(basename $(notdir $@))__=1 \
-		-D__MSVCRT__ -C -E -P -xc-header \
+		-C -E -P -xc-header \
 		$? > $@
 
 SRCDIR := lib/lib32
@@ -693,13 +693,9 @@ lib%.a: %.o
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 SRCDIR := src/libcrt/crt
-$(SRCDIR)/crt1.o $(SRCDIR)/dllcrt1.o:
-	$(MKDIR_P) $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $<
-
 $(SRCDIR)/crt2.o $(SRCDIR)/dllcrt2.o:
 	$(MKDIR_P) $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -D__MSVCRT__ -U__CRTDLL__ -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 $(SRCDIR)/crt1.o: $(SRCDIR)/crt1.c
 $(SRCDIR)/dllcrt1.o: $(SRCDIR)/dllcrt1.c
@@ -716,13 +712,9 @@ $(libscrnsavw_a_OBJECTS): $(libscrnsavw_a_SOURCES)
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $(scrnsavw_o_CFLAGS) -o $@ $<
 
 SRCDIR := misc/gpl/profile
-$(SRCDIR)/gcrt1.o:
-	mkdir -p $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $<
-
 $(SRCDIR)/gcrt2.o:
 	mkdir -p $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -D__MSVCRT__ -U__CRTDLL__ -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 $(SRCDIR)/gcrt1.o $(SRCDIR)/gcrt2.o: $(SRCDIR)/gcrt0.c
 
diff --git a/include/assert.h b/include/assert.h
index 1eddeed..6f9cdd0 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -53,7 +53,7 @@ extern "C" {
 #else /* debugging enabled */
 
 /*
- * CRTDLL nicely supplies a function which does the actual output and
+ * The runtime nicely supplies a function which does the actual output and
  * call to abort.
  */
 _CRTIMP void __cdecl __MINGW_NOTHROW _assert (const char*, const char*, int) __MINGW_ATTRIB_NORETURN;
diff --git a/include/ctype.h b/include/ctype.h
index 28ca1a9..e744a09 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -90,7 +90,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW toupper(int);
 
 /*
  * NOTE: The above are not old name type wrappers, but functions exported
- * explicitly by MSVCRT/CRTDLL. However, underscored versions are also
+ * explicitly by MSVCRT.DLL. However, underscored versions are also
  * exported.
  */
 #ifndef	__STRICT_ANSI__
@@ -105,22 +105,11 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int);
 /* Also defined in stdlib.h */
 #ifndef MB_CUR_MAX
 #ifdef __DECLSPEC_SUPPORTED
-# ifdef __MSVCRT__
-#  define MB_CUR_MAX __mb_cur_max
    __MINGW_IMPORT int __mb_cur_max;
-# else	/* not __MSVCRT */
-#  define MB_CUR_MAX __mb_cur_max_dll
-   __MINGW_IMPORT int __mb_cur_max_dll;
-# endif	/* not __MSVCRT */
-
+#  define MB_CUR_MAX __mb_cur_max
 #else		/* ! __DECLSPEC_SUPPORTED */
-# ifdef __MSVCRT__
    extern int* _imp____mb_cur_max;
 #  define MB_CUR_MAX (*_imp____mb_cur_max)
-# else		/* not __MSVCRT */
-   extern int*  _imp____mb_cur_max_dll;
-#  define MB_CUR_MAX (*_imp____mb_cur_max_dll)
-# endif 	/* not __MSVCRT */
 #endif  	/*  __DECLSPEC_SUPPORTED */
 #endif  /* MB_CUR_MAX */
 
@@ -129,25 +118,15 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int);
 # if __MSVCRT_VERSION__ <= 0x0700
   __MINGW_IMPORT unsigned short _ctype[];
 # endif
-# ifdef __MSVCRT__
   __MINGW_IMPORT unsigned short* _pctype;
-# else /* CRTDLL */
-  __MINGW_IMPORT unsigned short* _pctype_dll;
-# define  _pctype _pctype_dll
-# endif 
 
 #else		/*  __DECLSPEC_SUPPORTED */
 # if __MSVCRT_VERSION__ <= 0x0700
   extern unsigned short** _imp___ctype;
 # define _ctype (*_imp___ctype)
 # endif
-# ifdef __MSVCRT__
   extern unsigned short** _imp___pctype;
 # define _pctype (*_imp___pctype)
-# else /* CRTDLL */
-  extern unsigned short** _imp___pctype_dll;
-# define _pctype (*_imp___pctype_dll)
-# endif /* CRTDLL */
 #endif		/*  __DECLSPEC_SUPPORTED */
 
 /*
diff --git a/include/direct.h b/include/direct.h
index 149b8ed..5c576f5 100644
--- a/include/direct.h
+++ b/include/direct.h
@@ -68,13 +68,11 @@ _CRTIMP unsigned __cdecl __MINGW_NOTHROW _getdiskfree (unsigned, struct _diskfre
 
 #ifndef _WDIRECT_DEFINED
 /* wide character versions. Also in wchar.h */
-#ifdef __MSVCRT__ 
 _CRTIMP int __cdecl __MINGW_NOTHROW _wchdir(const wchar_t*);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetcwd(wchar_t*, int);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetdcwd(int, wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wmkdir(const wchar_t*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wrmdir(const wchar_t*);
-#endif	/* __MSVCRT__ */
 #define _WDIRECT_DEFINED
 #endif
 
diff --git a/include/dos.h b/include/dos.h
index 25d06d4..e2c629f 100644
--- a/include/dos.h
+++ b/include/dos.h
@@ -46,41 +46,6 @@
 extern "C" {
 #endif
 
-#ifndef __MSVCRT__ /* these are in CRTDLL, but not MSVCRT */
-#ifndef __DECLSPEC_SUPPORTED
-extern unsigned int *_imp___basemajor_dll;
-extern unsigned int *_imp___baseminor_dll;
-extern unsigned int *_imp___baseversion_dll;
-extern unsigned int *_imp___osmajor_dll;
-extern unsigned int *_imp___osminor_dll;
-extern unsigned int *_imp___osmode_dll;
-
-#define _basemajor (*_imp___basemajor_dll)
-#define _baseminor (*_imp___baseminor_dll)
-#define _baseversion (*_imp___baseversion_dll)
-#define _osmajor (*_imp___osmajor_dll)
-#define _osminor (*_imp___osminor_dll)
-#define _osmode (*_imp___osmode_dll)
-
-#else /* __DECLSPEC_SUPPORTED */
-
-__MINGW_IMPORT unsigned int _basemajor_dll;
-__MINGW_IMPORT unsigned int _baseminor_dll;
-__MINGW_IMPORT unsigned int _baseversion_dll;
-__MINGW_IMPORT unsigned int _osmajor_dll;
-__MINGW_IMPORT unsigned int _osminor_dll;
-__MINGW_IMPORT unsigned int _osmode_dll;
-
-#define _basemajor _basemajor_dll
-#define _baseminor _baseminor_dll
-#define _baseversion _baseversion_dll
-#define _osmajor _osmajor_dll
-#define _osminor _osminor_dll
-#define _osmode _osmode_dll
-
-#endif /* __DECLSPEC_SUPPORTED */
-#endif /* ! __MSVCRT__ */
-
 #ifndef _DISKFREE_T_DEFINED
 /* needed by _getdiskfree (also in direct.h) */
 struct _diskfree_t {
diff --git a/include/io.h b/include/io.h
index 521871e..77e4559 100644
--- a/include/io.h
+++ b/include/io.h
@@ -267,7 +267,6 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _mkdir (const char*);
 _CRTIMP char* __cdecl __MINGW_NOTHROW _mktemp (char*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _rmdir (const char*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _chmod (const char*, int);
-#ifdef __MSVCRT__
 _CRTIMP __int64 __cdecl __MINGW_NOTHROW _filelengthi64(int);
 #if __MSVCRT_VERSION__ < 0x0800
 _CRTIMP intptr_t __cdecl __MINGW_NOTHROW _findfirsti64(const char*, struct _finddatai64_t*);
@@ -306,8 +305,6 @@ __CRT_INLINE off64_t lseek64 (int fd, off64_t offset, int whence)
 }
 #endif
 
-#endif /* __MSVCRT__ */
-
 #ifndef _NO_OLDNAMES
 
 #ifndef _UWIN
@@ -398,9 +395,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _unlink (const char*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _write (int, const void*, unsigned int);
 
 /* Wide character versions. Also declared in wchar.h. */
-/* Not in crtdll.dll */
 #if !defined (_WIO_DEFINED)
-#if defined (__MSVCRT__)
 _CRTIMP int __cdecl __MINGW_NOTHROW _waccess(const wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wchmod(const wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wcreat(const wchar_t*, int);
@@ -441,7 +436,6 @@ _CRTALIAS intptr_t __cdecl __MINGW_NOTHROW _wfindfirsti64 (const wchar_t* _v1, s
 _CRTALIAS int  __cdecl __MINGW_NOTHROW	_wfindnexti64 (intptr_t _v1, struct _wfinddatai64_t* _v2)	 { return(_wfindnext32i64  (_v1,(struct _wfinddata32i64_t*)_v2)); }
 #endif /* !_USE_32BIT_TIME_T */
 #endif /* __MSVCRT_VERSION__ >= 0x0800 */
-#endif /* defined (__MSVCRT__) */
 #define _WIO_DEFINED
 #endif /* _WIO_DEFINED */
 
diff --git a/include/math.h b/include/math.h
index 03f6bd0..f286999 100644
--- a/include/math.h
+++ b/include/math.h
@@ -106,8 +106,6 @@ extern "C" {
  * __imp__HUGE is a pointer to the actual variable _HUGE in
  * MSVCRT.DLL. If we used _HUGE directly we would get a pointer
  * to a thunk function.
- *
- * NOTE: The CRTDLL version uses _HUGE_dll instead.
  */
 
 #if __MINGW_GNUC_PREREQ(3, 3)
@@ -116,25 +114,13 @@ extern "C" {
 
 #ifndef __DECLSPEC_SUPPORTED
 
-#ifdef __MSVCRT__
 extern double*	_imp___HUGE;
 #define	HUGE_VAL	(*_imp___HUGE)
-#else
-/* CRTDLL */
-extern double*	_imp___HUGE_dll;
-#define	HUGE_VAL	(*_imp___HUGE_dll)
-#endif
 
 #else /* __DECLSPEC_SUPPORTED */
 
-#ifdef __MSVCRT__
 __MINGW_IMPORT double	_HUGE;
 #define	HUGE_VAL	_HUGE
-#else
-/* CRTDLL */
-__MINGW_IMPORT double	_HUGE_dll;
-#define	HUGE_VAL	_HUGE_dll
-#endif
 
 #endif /* __DECLSPEC_SUPPORTED */
 #endif /* __MINGW_GNUC_PREREQ(3, 3) */
diff --git a/include/process.h b/include/process.h
index c8cbb1d..094e644 100644
--- a/include/process.h
+++ b/include/process.h
@@ -121,9 +121,6 @@ _CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wspawnvpe	(int, const wchar_t*, const
 #endif
 
 /*
- * The functions _beginthreadex and _endthreadex are not provided by CRTDLL.
- * They are provided by MSVCRT.
- *
  * NOTE: Apparently _endthread calls CloseHandle on the handle of the thread,
  * making for race conditions if you are not careful. Basically you have to
  * make sure that no-one is going to do *anything* with the thread handle
@@ -135,13 +132,10 @@ _CRTIMP unsigned long __cdecl __MINGW_NOTHROW
 	_beginthread	(void (*)(void *), unsigned, void*);
 _CRTIMP void __cdecl __MINGW_NOTHROW _endthread	(void);
 
-#ifdef	__MSVCRT__
 _CRTIMP unsigned long __cdecl __MINGW_NOTHROW
 	_beginthreadex	(void *, unsigned, unsigned (__stdcall *) (void *), 
 			 void*, unsigned, unsigned*);
 _CRTIMP void __cdecl __MINGW_NOTHROW _endthreadex (unsigned);
-#endif
-
 
 #ifndef	_NO_OLDNAMES
 /*
diff --git a/include/setjmp.h b/include/setjmp.h
index 0c694bb..ed5e802 100644
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -46,7 +46,7 @@ extern "C" {
 typedef _JBTYPE jmp_buf[_JBLEN];
 
 /*
- * The function provided by CRTDLL which appears to do the actual work
+ * The function provided by MSVCRT.DLL which appears to do the actual work
  * of setjmp.
  */
 _CRTIMP int __cdecl __MINGW_NOTHROW _setjmp (jmp_buf);
diff --git a/include/stdio.h b/include/stdio.h
index a6d7112..d81b29a 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -461,15 +461,10 @@ size_t __cdecl __MINGW_NOTHROW __mingw_fwrite (const void*, size_t, size_t, FILE
  * this type are unknown, but we (the compiler) need to know the size
  * because the programmer using fgetpos and fsetpos will be setting aside
  * storage for fpos_t structres. Actually I tested using a byte array and
- * it is fairly evident that the fpos_t type is a long (in CRTDLL.DLL).
- * Perhaps an unsigned long? TODO? It's definitely a 64-bit number in
+ * it is fairly evident that the fpos_t it's a 64-bit number in
  * MSVCRT however, and for now `long long' will do.
  */
-#ifdef __MSVCRT__
 typedef long long fpos_t;
-#else
-typedef long	fpos_t;
-#endif
 
 _CRTIMP int __cdecl __MINGW_NOTHROW	fgetpos	(FILE*, fpos_t*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	fsetpos (FILE*, const fpos_t*);
@@ -517,10 +512,8 @@ _CRTIMP FILE* __cdecl __MINGW_NOTHROW	_fdopen (int, const char*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	_fileno (FILE*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	_fcloseall (void);
 _CRTIMP FILE* __cdecl __MINGW_NOTHROW	_fsopen (const char*, const char*, int);
-#ifdef __MSVCRT__
 _CRTIMP int __cdecl __MINGW_NOTHROW	_getmaxstdio (void);
 _CRTIMP int __cdecl __MINGW_NOTHROW	_setmaxstdio (int);
-#endif
 
 #if __MSVCRT_VERSION__ >= 0x800
 _CRTIMP unsigned int __cdecl __MINGW_NOTHROW _get_output_format (void);
@@ -544,7 +537,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	fileno (FILE*);
 #define fileno(__F) ((__F)->_file)
 #endif
 
-#if defined (__MSVCRT__) && !defined (__NO_MINGW_LFS)
+#if !defined (__NO_MINGW_LFS)
 #include <sys/types.h>
 __CRT_INLINE FILE* __cdecl __MINGW_NOTHROW fopen64 (const char*, const char*);
 __CRT_INLINE FILE* __cdecl __MINGW_NOTHROW fopen64 (const char* filename, const char* mode)
@@ -557,7 +550,7 @@ int __cdecl __MINGW_NOTHROW fseeko64 (FILE*, off64_t, int);
 #ifdef __USE_MINGW_FSEEK
 int __cdecl __MINGW_NOTHROW __mingw_fseeko64 (FILE *, off64_t, int);
 #define fseeko64(fp, offset, whence)  __mingw_fseeko64(fp, offset, whence)
-#endif
+#endif /* __USER_MINGW_FSEEK */
 
 __CRT_INLINE off64_t __cdecl __MINGW_NOTHROW ftello64 (FILE *);
 __CRT_INLINE off64_t __cdecl __MINGW_NOTHROW ftello64 (FILE * stream)
@@ -596,7 +589,6 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	swprintf (wchar_t*, const wchar_t*, ...);
 _CRTIMP int __cdecl __MINGW_NOTHROW	vswprintf (wchar_t*, const wchar_t*, __VALIST);
 #endif
 
-#ifdef __MSVCRT__ 
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW fgetws (wchar_t*, int, FILE*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	fputws (const wchar_t*, FILE*);
 _CRTIMP wint_t __cdecl __MINGW_NOTHROW	getwc (FILE*);
@@ -619,7 +611,6 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	_wremove (const wchar_t*);
 _CRTIMP void __cdecl __MINGW_NOTHROW	_wperror (const wchar_t*);
 _CRTIMP FILE* __cdecl __MINGW_NOTHROW	_wpopen (const wchar_t*, const wchar_t*);
 #endif  /* __STRICT_ANSI__ */
-#endif	/* __MSVCRT__ */
 
 #ifndef __NO_ISOCEXT  /* externs in libmingwex.a */
 int __cdecl __MINGW_NOTHROW snwprintf (wchar_t* s, size_t n, const wchar_t*  format, ...);
@@ -640,11 +631,9 @@ int __cdecl __MINGW_NOTHROW vswscanf (const wchar_t * __restrict__,
 #endif /* _WSTDIO_DEFINED */
 
 #ifndef __STRICT_ANSI__
-#ifdef __MSVCRT__
 #ifndef NO_OLDNAMES
 _CRTIMP FILE* __cdecl __MINGW_NOTHROW	wpopen (const wchar_t*, const wchar_t*);
 #endif /* not NO_OLDNAMES */
-#endif /* MSVCRT runtime */
 
 /*
  * Other Non ANSI wide functions
diff --git a/include/stdlib.h b/include/stdlib.h
index 2105b86..d0b7cb8 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -86,7 +86,6 @@ extern int	_argc;
 extern char**	_argv;
 
 /* imports from runtime dll of the above variables */
-#ifdef __MSVCRT__
 
 extern int*  __cdecl __MINGW_NOTHROW   __p___argc(void);
 extern char*** __cdecl __MINGW_NOTHROW  __p___argv(void);
@@ -96,47 +95,17 @@ extern wchar_t***  __cdecl __MINGW_NOTHROW __p___wargv(void);
 #define __argv (*__p___argv())
 #define __wargv (*__p___wargv())
 
-#else /* !MSVCRT */
-
-#ifndef __DECLSPEC_SUPPORTED
-
-extern int*    _imp____argc_dll;
-extern char***  _imp____argv_dll;
-#define __argc (*_imp____argc_dll)
-#define __argv (*_imp____argv_dll)
-
-#else /* __DECLSPEC_SUPPORTED */
-
-__MINGW_IMPORT int    __argc_dll;
-__MINGW_IMPORT char**  __argv_dll;
-#define __argc __argc_dll
-#define __argv __argv_dll
-
-#endif /* __DECLSPEC_SUPPORTED */
-
-#endif /* __MSVCRT */
 #endif /* __STRICT_ANSI__ */
 /*
  * Also defined in ctype.h.
  */
 #ifndef MB_CUR_MAX
 #ifdef __DECLSPEC_SUPPORTED
-# ifdef __MSVCRT__
 #  define MB_CUR_MAX __mb_cur_max
    __MINGW_IMPORT int __mb_cur_max;
-# else		/* not __MSVCRT */
-#  define MB_CUR_MAX __mb_cur_max_dll
-   __MINGW_IMPORT int __mb_cur_max_dll;
-# endif		/* not __MSVCRT */
-
 #else		/* ! __DECLSPEC_SUPPORTED */
-# ifdef __MSVCRT__
    extern int* _imp____mb_cur_max;
 #  define MB_CUR_MAX (*_imp____mb_cur_max)
-# else		/* not __MSVCRT */
-   extern int*  _imp____mb_cur_max_dll;
-#  define MB_CUR_MAX (*_imp____mb_cur_max_dll)
-# endif 	/* not __MSVCRT */
 #endif  	/*  __DECLSPEC_SUPPORTED */
 #endif  /* MB_CUR_MAX */
 
@@ -159,24 +128,13 @@ extern int errno;
  * Use environ from the DLL, not as a global. 
  */
 
-#ifdef __MSVCRT__
   extern _CRTIMP char *** __cdecl __MINGW_NOTHROW __p__environ(void);
   extern _CRTIMP wchar_t *** __cdecl __MINGW_NOTHROW  __p__wenviron(void);
 # define _environ (*__p__environ())
 # define _wenviron (*__p__wenviron())
-#else /* ! __MSVCRT__ */
-# ifndef __DECLSPEC_SUPPORTED
-    extern char *** _imp___environ_dll;
-#   define _environ (*_imp___environ_dll)
-# else /* __DECLSPEC_SUPPORTED */
-    __MINGW_IMPORT char ** _environ_dll;
-#   define _environ _environ_dll
-# endif /* __DECLSPEC_SUPPORTED */
-#endif /* ! __MSVCRT__ */
 
 #define environ _environ
 
-#ifdef	__MSVCRT__
 /* One of the MSVCRTxx libraries */
 
 #ifndef __DECLSPEC_SUPPORTED
@@ -189,20 +147,6 @@ extern int errno;
 # endif /* _UWIN */
 #endif /* __DECLSPEC_SUPPORTED */
 
-#else /* ! __MSVCRT__ */
-
-/* CRTDLL run time library */
-
-#ifndef __DECLSPEC_SUPPORTED
-  extern int*	_imp___sys_nerr_dll;
-# define sys_nerr	(*_imp___sys_nerr_dll)
-#else /* __DECLSPEC_SUPPORTED */
-  __MINGW_IMPORT int	_sys_nerr_dll;
-# define sys_nerr	_sys_nerr_dll
-#endif /* __DECLSPEC_SUPPORTED */
-
-#endif /* ! __MSVCRT__ */
-
 #ifndef __DECLSPEC_SUPPORTED
 extern char***	_imp__sys_errlist;
 #define	sys_errlist	(*_imp___sys_errlist)
@@ -217,9 +161,6 @@ __MINGW_IMPORT char*	_sys_errlist[];
  * OS version and such constants.
  */
 
-#ifdef	__MSVCRT__
-/* msvcrtxx.dll */
-
 extern _CRTIMP unsigned __cdecl __MINGW_NOTHROW int*	__p__osver(void);
 extern _CRTIMP unsigned __cdecl __MINGW_NOTHROW int*	__p__winver(void);
 extern _CRTIMP unsigned __cdecl __MINGW_NOTHROW int*	__p__winmajor(void);
@@ -237,54 +178,13 @@ __MINGW_IMPORT unsigned int _winmajor;
 __MINGW_IMPORT unsigned int _winminor;
 #endif /* __DECLSPEC_SUPPORTED */
 
-#else
-/* Not msvcrtxx.dll, thus crtdll.dll */
-
-#ifndef __DECLSPEC_SUPPORTED
-
-extern unsigned int*	_imp___osver_dll;
-extern unsigned int*	_imp___winver_dll;
-extern unsigned int*	_imp___winmajor_dll;
-extern unsigned int*	_imp___winminor_dll;
-
-#define _osver		(*_imp___osver_dll)
-#define _winver		(*_imp___winver_dll)
-#define _winmajor	(*_imp___winmajor_dll)
-#define _winminor	(*_imp___winminor_dll)
-
-#else /* __DECLSPEC_SUPPORTED */
-
-__MINGW_IMPORT unsigned int	_osver_dll;
-__MINGW_IMPORT unsigned int	_winver_dll;
-__MINGW_IMPORT unsigned int	_winmajor_dll;
-__MINGW_IMPORT unsigned int	_winminor_dll;
-
-#define _osver		_osver_dll
-#define _winver		_winver_dll
-#define _winmajor	_winmajor_dll
-#define _winminor	_winminor_dll
 
-#endif /* __DECLSPEC_SUPPORTED */
-
-#endif
-
-#if defined  __MSVCRT__
 /* although the _pgmptr is exported as DATA,
  * be safe and use the access function __p__pgmptr() to get it. */
 _CRTIMP char** __cdecl __MINGW_NOTHROW __p__pgmptr(void);
 #define _pgmptr     (*__p__pgmptr())
 _CRTIMP wchar_t** __cdecl __MINGW_NOTHROW __p__wpgmptr(void);
 #define _wpgmptr    (*__p__wpgmptr())
-#else /* ! __MSVCRT__ */
-# ifndef __DECLSPEC_SUPPORTED
-  extern char** __imp__pgmptr_dll;
-# define _pgmptr (*_imp___pgmptr_dll)
-# else /* __DECLSPEC_SUPPORTED */
- __MINGW_IMPORT char* _pgmptr_dll;
-# define _pgmptr _pgmptr_dll
-# endif /* __DECLSPEC_SUPPORTED */
-/* no wide version in CRTDLL */
-#endif /* __MSVCRT__ */
 
 /*
  * This variable determines the default file mode.
@@ -292,23 +192,12 @@ _CRTIMP wchar_t** __cdecl __MINGW_NOTHROW __p__wpgmptr(void);
  */
 #if !defined (__DECLSPEC_SUPPORTED) || defined (__IN_MINGW_RUNTIME)
 
-#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 */
 
@@ -353,7 +242,6 @@ _CRTIMP double __cdecl __MINGW_NOTHROW	wcstod	(const wchar_t*, wchar_t**);
 float __cdecl __MINGW_NOTHROW wcstof( const wchar_t * __restrict__, wchar_t ** __restrict__);
 long double __cdecl __MINGW_NOTHROW wcstold (const wchar_t * __restrict__, wchar_t ** __restrict__);
 #endif /* __NO_ISOCEXT */
-#ifdef __MSVCRT__ 
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetenv(const wchar_t*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	_wputenv(const wchar_t*);
 _CRTIMP void __cdecl __MINGW_NOTHROW	_wsearchenv(const wchar_t*, const wchar_t*, wchar_t*);
@@ -361,7 +249,6 @@ _CRTIMP int __cdecl __MINGW_NOTHROW   	_wsystem(const wchar_t*);
 _CRTIMP void __cdecl __MINGW_NOTHROW    _wmakepath(wchar_t*, const wchar_t*, const wchar_t*, const wchar_t*, const wchar_t*);
 _CRTIMP void __cdecl __MINGW_NOTHROW	_wsplitpath (const wchar_t*, wchar_t*, wchar_t*, wchar_t*, wchar_t*);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW   _wfullpath (wchar_t*, const wchar_t*, size_t);
-#endif
 #define _WSTDLIB_DEFINED
 #endif
 
@@ -447,7 +334,6 @@ _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW  _itow (int, wchar_t*, int);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW  _ltow (long, wchar_t*, int);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW  _ultow (unsigned long, wchar_t*, int);
 
-#ifdef __MSVCRT__
 _CRTIMP __int64 __cdecl __MINGW_NOTHROW	_atoi64(const char *);
 _CRTIMP char* __cdecl __MINGW_NOTHROW	_i64toa(__int64, char *, int);
 _CRTIMP char* __cdecl __MINGW_NOTHROW	_ui64toa(unsigned __int64, char *, int);
@@ -493,7 +379,6 @@ typedef void
 _invalid_parameter_handler _set_invalid_parameter_handler (_invalid_parameter_handler);
 
 # endif /* __MSVCRT_VERSION__ >= 0x800 */
-#endif /* __MSVCRT__ */
 
 #ifndef	_NO_OLDNAMES
 
@@ -536,7 +421,6 @@ __CRT_INLINE long long __cdecl __MINGW_NOTHROW llabs(long long _j)
 long long  __cdecl __MINGW_NOTHROW strtoll (const char* __restrict__, char** __restrict, int);
 unsigned long long  __cdecl __MINGW_NOTHROW strtoull (const char* __restrict__, char** __restrict__, int);
 
-#if defined (__MSVCRT__) /* these are stubs for MS _i64 versions */ 
 long long  __cdecl __MINGW_NOTHROW atoll (const char *);
 
 #if !defined (__STRICT_ANSI__)
@@ -563,8 +447,6 @@ __CRT_INLINE wchar_t*  __cdecl __MINGW_NOTHROW ulltow (unsigned long long _n, wc
 #endif /* (__NO_INLINE__) */
 #endif /* (__STRICT_ANSI__)  */
 
-#endif /* __MSVCRT__ */
-
 #endif /* !__NO_ISOCEXT */
 
 
diff --git a/include/string.h b/include/string.h
index dfb9294..b530de5 100644
--- a/include/string.h
+++ b/include/string.h
@@ -73,7 +73,7 @@ _CRTIMP size_t __cdecl __MINGW_NOTHROW	strxfrm (char*, const char*, size_t);
 
 #ifndef __STRICT_ANSI__
 /*
- * Extra non-ANSI functions provided by the CRTDLL library
+ * Extra non-ANSI functions provided by the runtime library
  */
 _CRTIMP char* __cdecl __MINGW_NOTHROW	_strerror (const char *);
 _CRTIMP void* __cdecl __MINGW_NOTHROW	_memccpy (void*, const void*, int, size_t);
@@ -90,10 +90,8 @@ _CRTIMP char* __cdecl __MINGW_NOTHROW	_strset (char*, int);
 _CRTIMP char* __cdecl __MINGW_NOTHROW	_strupr (char*);
 _CRTIMP void __cdecl __MINGW_NOTHROW	_swab (const char*, char*, size_t);
 
-#ifdef __MSVCRT__
 _CRTIMP int __cdecl __MINGW_NOTHROW  _strncoll(const char*, const char*, size_t);
 _CRTIMP int __cdecl __MINGW_NOTHROW  _strnicoll(const char*, const char*, size_t);
-#endif
 
 #ifndef	_NO_OLDNAMES
 /*
@@ -156,11 +154,8 @@ _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW wcstok(wchar_t*, const wchar_t*);
 _CRTIMP size_t __cdecl __MINGW_NOTHROW	wcsxfrm(wchar_t*, const wchar_t*, size_t);
 
 #ifndef	__STRICT_ANSI__
-/*
- * Unicode versions of non-ANSI string functions provided by CRTDLL.
- */
 
-/* NOTE: _wcscmpi not provided by CRTDLL, this define is for portability */
+/* NOTE: _wcscmpi not provided by MSVCRT.DLL, this define is for portability */
 #define		_wcscmpi	_wcsicmp
 
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wcsdup (const wchar_t*);
@@ -173,14 +168,12 @@ _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wcsrev (wchar_t*);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wcsset (wchar_t*, wchar_t);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wcsupr (wchar_t*);
 
-#ifdef __MSVCRT__
 _CRTIMP int __cdecl __MINGW_NOTHROW  _wcsncoll(const wchar_t*, const wchar_t*, size_t);
 _CRTIMP int   __cdecl __MINGW_NOTHROW _wcsnicoll(const wchar_t*, const wchar_t*, size_t);
 #if __MSVCRT_VERSION__ >= 0x0700
 _CRTIMP  wchar_t* __cdecl __MINGW_NOTHROW _wcserror(int);
 _CRTIMP  wchar_t* __cdecl __MINGW_NOTHROW __wcserror(const wchar_t*);
 #endif
-#endif
 
 #ifndef	_NO_OLDNAMES
 /* NOTE: There is no _wcscmpi, but this is for compatibility. */
diff --git a/include/sys/stat.h b/include/sys/stat.h
index 1a22dfb..b39a792 100644
--- a/include/sys/stat.h
+++ b/include/sys/stat.h
@@ -130,7 +130,6 @@ struct stat
 };
 #endif /* _NO_OLDNAMES */
 
-#if defined (__MSVCRT__)
 struct _stati64 {
     _dev_t st_dev;
     _ino_t st_ino;
@@ -202,7 +201,6 @@ struct _stat64i32 {
 	__time64_t	st_ctime;
 };
 #endif /* __MSVCRT_VERSION__ >= 0x0800 */
-#endif /* __MSVCRT__ */
 #define _STAT_DEFINED
 #endif /* _STAT_DEFINED */
 
@@ -227,7 +225,6 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	stat (const char*, struct stat*);
 
 #endif	/* Not _NO_OLDNAMES */
 
-#if defined (__MSVCRT__)
 #if __MSVCRT_VERSION__ < 0x0800
 _CRTIMP int __cdecl __MINGW_NOTHROW  _fstati64(int, struct _stati64 *);
 _CRTIMP int __cdecl __MINGW_NOTHROW  _stati64(const char *, struct _stati64 *);
@@ -280,7 +277,6 @@ _CRTALIAS int __cdecl __MINGW_NOTHROW	_wstati64 (const wchar_t* _v1, struct _sta
 #endif /* __MSVCRT_VERSION__ >= 0x0800 */
 #define _WSTAT_DEFINED
 #endif /* _WSTAT_DEFIND */
-#endif /* __MSVCRT__ */
 
 #ifdef	__cplusplus
 }
diff --git a/include/sys/types.h b/include/sys/types.h
index 47cc3df..bb34549 100644
--- a/include/sys/types.h
+++ b/include/sys/types.h
@@ -72,11 +72,7 @@ typedef _off_t	off_t;
 
 #ifndef _DEV_T_
 #define	_DEV_T_
-#ifdef __MSVCRT__
 typedef unsigned int _dev_t;
-#else
-typedef short _dev_t;
-#endif
 
 #ifndef	_NO_OLDNAMES
 typedef _dev_t	dev_t;
diff --git a/include/sys/utime.h b/include/sys/utime.h
index dfbaefe..760ea5f 100644
--- a/include/sys/utime.h
+++ b/include/sys/utime.h
@@ -81,11 +81,9 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	_futime (int, struct _utimbuf*);
 
 /* The wide character version, only available for MSVCRT versions of the
  * C runtime library. */
-#ifdef __MSVCRT__
 #if __MSVCRT_VERSION__ < 0x0800
 _CRTIMP int __cdecl __MINGW_NOTHROW	_wutime (const wchar_t*, struct _utimbuf*);
 #endif
-#endif /* MSVCRT runtime */
 
 /* These require newer versions of msvcrt.dll (6.10 or higher).  */ 
 #if __MSVCRT_VERSION__ >= 0x0601
diff --git a/include/tchar.h b/include/tchar.h
index e72a8d8..5a4ef8c 100644
--- a/include/tchar.h
+++ b/include/tchar.h
@@ -179,9 +179,7 @@ typedef wchar_t _TCHAR;
 #define _wcsncnt(_w

[MinGW-cvs] [git push mingw.org-wsl]Repository: mingw.org-wsl branch redo-filters created. 5567112e48461df58aa06fdfed7ca45a0ff450b9

From: Earnie B. <no...@so...> - 2012-09-07 19:56:31

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw.org-wsl".

The branch, redo-filters has been created
        at  5567112e48461df58aa06fdfed7ca45a0ff450b9 (commit)

- Log -----------------------------------------------------------------
http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw.org-wsl;a=commitdiff;h=

commit fd0c88828fac399eb5b703354584b6fdc03b8e93
Author: Earnie Boyd <ea...@us...>
Date:   Fri Sep 7 10:36:34 2012 -0400

    	Remove filters for CRTDLL and __MSVCRT__.
    
    	* Makefile.in: Remove -[DU]__MSVCRT__ and -[DU]__CRTDLL__.
    	* crt1.o: Remove CRTDLL specific target.
    	* dllcrt1.o: Ditto.
    	* gcrt1.o: Ditto.
    	* include/assert.h: Modify documentation to remove the use of CRTDLL.
    	* include/setjmp.h: Ditto.
    	* src/libcrt/crt/ofmt_stub.s: Ditto.
    	* include/ctype.h: Ditto.
    	Remove filters for __MSVCRT__ and unneeded #else coding.
    	* include/dirent.h: Ditto.
    	* include/dos.h: Ditto.
    	* include/io.h: Ditto.
    	* include/math.h: Ditto.
    	* include/process.h: Ditto.
    	* include/stdio.h: Ditto.
    	* include/stdlib.h: Ditto.
    	* include/string.h: Ditto.
    	* include/sys/stat.h: Ditto.
    	* include/sys/types.h: Ditto.
    	* include/sys/utime.h: Ditto.
    	* include/tchar.h: Ditto.
    	* include/time.h: Ditto.
    	* include/wchar.h: Ditto.
    	* include/wctype.h: Ditto.
    	* src/libcrt/crt/crt1.c: Ditto.
    	* src/libcrt/crt/init.c: Ditto.
    	* lib/lib32/moldname.def.in: Remove filters for __CRTDLL__.
    	* src/libcrt/tlssup.c: Remove filter for CRTDLL.

diff --git a/ChangeLog b/ChangeLog
index 456f89f..7f5dc47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,38 @@
 2012-09-07  Earnie Boyd  <ea...@us...>
 
+	Remove filters for CRTDLL and __MSVCRT__.
+
+	* Makefile.in: Remove -[DU]__MSVCRT__ and -[DU]__CRTDLL__.
+	* crt1.o: Remove CRTDLL specific target.
+	* dllcrt1.o: Ditto.
+	* gcrt1.o: Ditto.
+	* include/assert.h: Modify documentation to remove the use of CRTDLL.
+	* include/setjmp.h: Ditto.
+	* src/libcrt/crt/ofmt_stub.s: Ditto.
+	* include/ctype.h: Ditto.
+	Remove filters for __MSVCRT__ and unneeded #else coding.
+	* include/dirent.h: Ditto.
+	* include/dos.h: Ditto.
+	* include/io.h: Ditto.
+	* include/math.h: Ditto.
+	* include/process.h: Ditto.
+	* include/stdio.h: Ditto.
+	* include/stdlib.h: Ditto.
+	* include/string.h: Ditto.
+	* include/sys/stat.h: Ditto.
+	* include/sys/types.h: Ditto.
+	* include/sys/utime.h: Ditto.
+	* include/tchar.h: Ditto.
+	* include/time.h: Ditto.
+	* include/wchar.h: Ditto.
+	* include/wctype.h: Ditto.
+	* src/libcrt/crt/crt1.c: Ditto.
+	* src/libcrt/crt/init.c: Ditto.
+	* lib/lib32/moldname.def.in: Remove filters for __CRTDLL__.
+	* src/libcrt/tlssup.c: Remove filter for CRTDLL.
+
+2012-09-07  Earnie Boyd  <ea...@us...>
+
 	Apply LICENSE to all files as appropriate.
 
 	* tests/Makefile.in: Add file preamble.
diff --git a/Makefile.in b/Makefile.in
index 9a8d6e8..d32a229 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -626,7 +626,7 @@ $(msvcrt_DEF): lib/lib32/msvcrt.def.in
 	$(CC) -DRUNTIME=$(basename $(notdir $@)) \
 		-D__FILENAME__=$@ \
 		-D__$(basename $(notdir $@))__=1 \
-		-D__MSVCRT__ -C -E -P -xc-header \
+		-C -E -P -xc-header \
 		$? > $@
 
 
@@ -641,7 +641,7 @@ $(moldname_DEF): lib/lib32/moldname.def.in
 	$(CC) -DRUNTIME=$(basename $(notdir $@)) \
 		-D__FILENAME__=$$F \
 		-D__$(basename $(notdir $@))__=1 \
-		-D__MSVCRT__ -C -E -P -xc-header \
+		-C -E -P -xc-header \
 		$? > $@
 
 SRCDIR := lib/lib32
@@ -693,13 +693,9 @@ lib%.a: %.o
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 SRCDIR := src/libcrt/crt
-$(SRCDIR)/crt1.o $(SRCDIR)/dllcrt1.o:
-	$(MKDIR_P) $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $<
-
 $(SRCDIR)/crt2.o $(SRCDIR)/dllcrt2.o:
 	$(MKDIR_P) $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -D__MSVCRT__ -U__CRTDLL__ -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 $(SRCDIR)/crt1.o: $(SRCDIR)/crt1.c
 $(SRCDIR)/dllcrt1.o: $(SRCDIR)/dllcrt1.c
@@ -716,13 +712,9 @@ $(libscrnsavw_a_OBJECTS): $(libscrnsavw_a_SOURCES)
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $(scrnsavw_o_CFLAGS) -o $@ $<
 
 SRCDIR := misc/gpl/profile
-$(SRCDIR)/gcrt1.o:
-	mkdir -p $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $<
-
 $(SRCDIR)/gcrt2.o:
 	mkdir -p $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -D__MSVCRT__ -U__CRTDLL__ -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 $(SRCDIR)/gcrt1.o $(SRCDIR)/gcrt2.o: $(SRCDIR)/gcrt0.c
 
diff --git a/include/assert.h b/include/assert.h
index 1eddeed..6f9cdd0 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -53,7 +53,7 @@ extern "C" {
 #else /* debugging enabled */
 
 /*
- * CRTDLL nicely supplies a function which does the actual output and
+ * The runtime nicely supplies a function which does the actual output and
  * call to abort.
  */
 _CRTIMP void __cdecl __MINGW_NOTHROW _assert (const char*, const char*, int) __MINGW_ATTRIB_NORETURN;
diff --git a/include/ctype.h b/include/ctype.h
index 28ca1a9..e744a09 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -90,7 +90,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW toupper(int);
 
 /*
  * NOTE: The above are not old name type wrappers, but functions exported
- * explicitly by MSVCRT/CRTDLL. However, underscored versions are also
+ * explicitly by MSVCRT.DLL. However, underscored versions are also
  * exported.
  */
 #ifndef	__STRICT_ANSI__
@@ -105,22 +105,11 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int);
 /* Also defined in stdlib.h */
 #ifndef MB_CUR_MAX
 #ifdef __DECLSPEC_SUPPORTED
-# ifdef __MSVCRT__
-#  define MB_CUR_MAX __mb_cur_max
    __MINGW_IMPORT int __mb_cur_max;
-# else	/* not __MSVCRT */
-#  define MB_CUR_MAX __mb_cur_max_dll
-   __MINGW_IMPORT int __mb_cur_max_dll;
-# endif	/* not __MSVCRT */
-
+#  define MB_CUR_MAX __mb_cur_max
 #else		/* ! __DECLSPEC_SUPPORTED */
-# ifdef __MSVCRT__
    extern int* _imp____mb_cur_max;
 #  define MB_CUR_MAX (*_imp____mb_cur_max)
-# else		/* not __MSVCRT */
-   extern int*  _imp____mb_cur_max_dll;
-#  define MB_CUR_MAX (*_imp____mb_cur_max_dll)
-# endif 	/* not __MSVCRT */
 #endif  	/*  __DECLSPEC_SUPPORTED */
 #endif  /* MB_CUR_MAX */
 
@@ -129,25 +118,15 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int);
 # if __MSVCRT_VERSION__ <= 0x0700
   __MINGW_IMPORT unsigned short _ctype[];
 # endif
-# ifdef __MSVCRT__
   __MINGW_IMPORT unsigned short* _pctype;
-# else /* CRTDLL */
-  __MINGW_IMPORT unsigned short* _pctype_dll;
-# define  _pctype _pctype_dll
-# endif 
 
 #else		/*  __DECLSPEC_SUPPORTED */
 # if __MSVCRT_VERSION__ <= 0x0700
   extern unsigned short** _imp___ctype;
 # define _ctype (*_imp___ctype)
 # endif
-# ifdef __MSVCRT__
   extern unsigned short** _imp___pctype;
 # define _pctype (*_imp___pctype)
-# else /* CRTDLL */
-  extern unsigned short** _imp___pctype_dll;
-# define _pctype (*_imp___pctype_dll)
-# endif /* CRTDLL */
 #endif		/*  __DECLSPEC_SUPPORTED */
 
 /*
diff --git a/include/direct.h b/include/direct.h
index 149b8ed..5c576f5 100644
--- a/include/direct.h
+++ b/include/direct.h
@@ -68,13 +68,11 @@ _CRTIMP unsigned __cdecl __MINGW_NOTHROW _getdiskfree (unsigned, struct _diskfre
 
 #ifndef _WDIRECT_DEFINED
 /* wide character versions. Also in wchar.h */
-#ifdef __MSVCRT__ 
 _CRTIMP int __cdecl __MINGW_NOTHROW _wchdir(const wchar_t*);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetcwd(wchar_t*, int);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetdcwd(int, wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wmkdir(const wchar_t*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wrmdir(const wchar_t*);
-#endif	/* __MSVCRT__ */
 #define _WDIRECT_DEFINED
 #endif
 
diff --git a/include/dos.h b/include/dos.h
index 25d06d4..e2c629f 100644
--- a/include/dos.h
+++ b/include/dos.h
@@ -46,41 +46,6 @@
 extern "C" {
 #endif
 
-#ifndef __MSVCRT__ /* these are in CRTDLL, but not MSVCRT */
-#ifndef __DECLSPEC_SUPPORTED
-extern unsigned int *_imp___basemajor_dll;
-extern unsigned int *_imp___baseminor_dll;
-extern unsigned int *_imp___baseversion_dll;
-extern unsigned int *_imp___osmajor_dll;
-extern unsigned int *_imp___osminor_dll;
-extern unsigned int *_imp___osmode_dll;
-
-#define _basemajor (*_imp___basemajor_dll)
-#define _baseminor (*_imp___baseminor_dll)
-#define _baseversion (*_imp___baseversion_dll)
-#define _osmajor (*_imp___osmajor_dll)
-#define _osminor (*_imp___osminor_dll)
-#define _osmode (*_imp___osmode_dll)
-
-#else /* __DECLSPEC_SUPPORTED */
-
-__MINGW_IMPORT unsigned int _basemajor_dll;
-__MINGW_IMPORT unsigned int _baseminor_dll;
-__MINGW_IMPORT unsigned int _baseversion_dll;
-__MINGW_IMPORT unsigned int _osmajor_dll;
-__MINGW_IMPORT unsigned int _osminor_dll;
-__MINGW_IMPORT unsigned int _osmode_dll;
-
-#define _basemajor _basemajor_dll
-#define _baseminor _baseminor_dll
-#define _baseversion _baseversion_dll
-#define _osmajor _osmajor_dll
-#define _osminor _osminor_dll
-#define _osmode _osmode_dll
-
-#endif /* __DECLSPEC_SUPPORTED */
-#endif /* ! __MSVCRT__ */
-
 #ifndef _DISKFREE_T_DEFINED
 /* needed by _getdiskfree (also in direct.h) */
 struct _diskfree_t {
diff --git a/include/io.h b/include/io.h
index 521871e..77e4559 100644
--- a/include/io.h
+++ b/include/io.h
@@ -267,7 +267,6 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _mkdir (const char*);
 _CRTIMP char* __cdecl __MINGW_NOTHROW _mktemp (char*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _rmdir (const char*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _chmod (const char*, int);
-#ifdef __MSVCRT__
 _CRTIMP __int64 __cdecl __MINGW_NOTHROW _filelengthi64(int);
 #if __MSVCRT_VERSION__ < 0x0800
 _CRTIMP intptr_t __cdecl __MINGW_NOTHROW _findfirsti64(const char*, struct _finddatai64_t*);
@@ -306,8 +305,6 @@ __CRT_INLINE off64_t lseek64 (int fd, off64_t offset, int whence)
 }
 #endif
 
-#endif /* __MSVCRT__ */
-
 #ifndef _NO_OLDNAMES
 
 #ifndef _UWIN
@@ -398,9 +395,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _unlink (const char*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _write (int, const void*, unsigned int);
 
 /* Wide character versions. Also declared in wchar.h. */
-/* Not in crtdll.dll */
 #if !defined (_WIO_DEFINED)
-#if defined (__MSVCRT__)
 _CRTIMP int __cdecl __MINGW_NOTHROW _waccess(const wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wchmod(const wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wcreat(const wchar_t*, int);
@@ -441,7 +436,6 @@ _CRTALIAS intptr_t __cdecl __MINGW_NOTHROW _wfindfirsti64 (const wchar_t* _v1, s
 _CRTALIAS int  __cdecl __MINGW_NOTHROW	_wfindnexti64 (intptr_t _v1, struct _wfinddatai64_t* _v2)	 { return(_wfindnext32i64  (_v1,(struct _wfinddata32i64_t*)_v2)); }
 #endif /* !_USE_32BIT_TIME_T */
 #endif /* __MSVCRT_VERSION__ >= 0x0800 */
-#endif /* defined (__MSVCRT__) */
 #define _WIO_DEFINED
 #endif /* _WIO_DEFINED */
 
diff --git a/include/math.h b/include/math.h
index 03f6bd0..f286999 100644
--- a/include/math.h
+++ b/include/math.h
@@ -106,8 +106,6 @@ extern "C" {
  * __imp__HUGE is a pointer to the actual variable _HUGE in
  * MSVCRT.DLL. If we used _HUGE directly we would get a pointer
  * to a thunk function.
- *
- * NOTE: The CRTDLL version uses _HUGE_dll instead.
  */
 
 #if __MINGW_GNUC_PREREQ(3, 3)
@@ -116,25 +114,13 @@ extern "C" {
 
 #ifndef __DECLSPEC_SUPPORTED
 
-#ifdef __MSVCRT__
 extern double*	_imp___HUGE;
 #define	HUGE_VAL	(*_imp___HUGE)
-#else
-/* CRTDLL */
-extern double*	_imp___HUGE_dll;
-#define	HUGE_VAL	(*_imp___HUGE_dll)
-#endif
 
 #else /* __DECLSPEC_SUPPORTED */
 
-#ifdef __MSVCRT__
 __MINGW_IMPORT double	_HUGE;
 #define	HUGE_VAL	_HUGE
-#else
-/* CRTDLL */
-__MINGW_IMPORT double	_HUGE_dll;
-#define	HUGE_VAL	_HUGE_dll
-#endif
 
 #endif /* __DECLSPEC_SUPPORTED */
 #endif /* __MINGW_GNUC_PREREQ(3, 3) */
diff --git a/include/process.h b/include/process.h
index c8cbb1d..094e644 100644
--- a/include/process.h
+++ b/include/process.h
@@ -121,9 +121,6 @@ _CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wspawnvpe	(int, const wchar_t*, const
 #endif
 
 /*
- * The functions _beginthreadex and _endthreadex are not provided by CRTDLL.
- * They are provided by MSVCRT.
- *
  * NOTE: Apparently _endthread calls CloseHandle on the handle of the thread,
  * making for race conditions if you are not careful. Basically you have to
  * make sure that no-one is going to do *anything* with the thread handle
@@ -135,13 +132,10 @@ _CRTIMP unsigned long __cdecl __MINGW_NOTHROW
 	_beginthread	(void (*)(void *), unsigned, void*);
 _CRTIMP void __cdecl __MINGW_NOTHROW _endthread	(void);
 
-#ifdef	__MSVCRT__
 _CRTIMP unsigned long __cdecl __MINGW_NOTHROW
 	_beginthreadex	(void *, unsigned, unsigned (__stdcall *) (void *), 
 			 void*, unsigned, unsigned*);
 _CRTIMP void __cdecl __MINGW_NOTHROW _endthreadex (unsigned);
-#endif
-
 
 #ifndef	_NO_OLDNAMES
 /*
diff --git a/include/setjmp.h b/include/setjmp.h
index 0c694bb..ed5e802 100644
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -46,7 +46,7 @@ extern "C" {
 typedef _JBTYPE jmp_buf[_JBLEN];
 
 /*
- * The function provided by CRTDLL which appears to do the actual work
+ * The function provided by MSVCRT.DLL which appears to do the actual work
  * of setjmp.
  */
 _CRTIMP int __cdecl __MINGW_NOTHROW _setjmp (jmp_buf);
diff --git a/include/stdio.h b/include/stdio.h
index a6d7112..d81b29a 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -461,15 +461,10 @@ size_t __cdecl __MINGW_NOTHROW __mingw_fwrite (const void*, size_t, size_t, FILE
  * this type are unknown, but we (the compiler) need to know the size
  * because the programmer using fgetpos and fsetpos will be setting aside
  * storage for fpos_t structres. Actually I tested using a byte array and
- * it is fairly evident that the fpos_t type is a long (in CRTDLL.DLL).
- * Perhaps an unsigned long? TODO? It's definitely a 64-bit number in
+ * it is fairly evident that the fpos_t it's a 64-bit number in
  * MSVCRT however, and for now `long long' will do.
  */
-#ifdef __MSVCRT__
 typedef long long fpos_t;
-#else
-typedef long	fpos_t;
-#endif
 
 _CRTIMP int __cdecl __MINGW_NOTHROW	fgetpos	(FILE*, fpos_t*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	fsetpos (FILE*, const fpos_t*);
@@ -517,10 +512,8 @@ _CRTIMP FILE* __cdecl __MINGW_NOTHROW	_fdopen (int, const char*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	_fileno (FILE*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	_fcloseall (void);
 _CRTIMP FILE* __cdecl __MINGW_NOTHROW	_fsopen (const char*, const char*, int);
-#ifdef __MSVCRT__
 _CRTIMP int __cdecl __MINGW_NOTHROW	_getmaxstdio (void);
 _CRTIMP int __cdecl __MINGW_NOTHROW	_setmaxstdio (int);
-#endif
 
 #if __MSVCRT_VERSION__ >= 0x800
 _CRTIMP unsigned int __cdecl __MINGW_NOTHROW _get_output_format (void);
@@ -544,7 +537,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	fileno (FILE*);
 #define fileno(__F) ((__F)->_file)
 #endif
 
-#if defined (__MSVCRT__) && !defined (__NO_MINGW_LFS)
+#if !defined (__NO_MINGW_LFS)
 #include <sys/types.h>
 __CRT_INLINE FILE* __cdecl __MINGW_NOTHROW fopen64 (const char*, const char*);
 __CRT_INLINE FILE* __cdecl __MINGW_NOTHROW fopen64 (const char* filename, const char* mode)
@@ -557,7 +550,7 @@ int __cdecl __MINGW_NOTHROW fseeko64 (FILE*, off64_t, int);
 #ifdef __USE_MINGW_FSEEK
 int __cdecl __MINGW_NOTHROW __mingw_fseeko64 (FILE *, off64_t, int);
 #define fseeko64(fp, offset, whence)  __mingw_fseeko64(fp, offset, whence)
-#endif
+#endif /* __USER_MINGW_FSEEK */
 
 __CRT_INLINE off64_t __cdecl __MINGW_NOTHROW ftello64 (FILE *);
 __CRT_INLINE off64_t __cdecl __MINGW_NOTHROW ftello64 (FILE * stream)
@@ -596,7 +589,6 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	swprintf (wchar_t*, const wchar_t*, ...);
 _CRTIMP int __cdecl __MINGW_NOTHROW	vswprintf (wchar_t*, const wchar_t*, __VALIST);
 #endif
 
-#ifdef __MSVCRT__ 
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW fgetws (wchar_t*, int, FILE*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	fputws (const wchar_t*, FILE*);
 _CRTIMP wint_t __cdecl __MINGW_NOTHROW	getwc (FILE*);
@@ -619,7 +611,6 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	_wremove (const wchar_t*);
 _CRTIMP void __cdecl __MINGW_NOTHROW	_wperror (const wchar_t*);
 _CRTIMP FILE* __cdecl __MINGW_NOTHROW	_wpopen (const wchar_t*, const wchar_t*);
 #endif  /* __STRICT_ANSI__ */
-#endif	/* __MSVCRT__ */
 
 #ifndef __NO_ISOCEXT  /* externs in libmingwex.a */
 int __cdecl __MINGW_NOTHROW snwprintf (wchar_t* s, size_t n, const wchar_t*  format, ...);
@@ -640,11 +631,9 @@ int __cdecl __MINGW_NOTHROW vswscanf (const wchar_t * __restrict__,
 #endif /* _WSTDIO_DEFINED */
 
 #ifndef __STRICT_ANSI__
-#ifdef __MSVCRT__
 #ifndef NO_OLDNAMES
 _CRTIMP FILE* __cdecl __MINGW_NOTHROW	wpopen (const wchar_t*, const wchar_t*);
 #endif /* not NO_OLDNAMES */
-#endif /* MSVCRT runtime */
 
 /*
  * Other Non ANSI wide functions
diff --git a/include/stdlib.h b/include/stdlib.h
index 2105b86..d0b7cb8 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -86,7 +86,6 @@ extern int	_argc;
 extern char**	_argv;
 
 /* imports from runtime dll of the above variables */
-#ifdef __MSVCRT__
 
 extern int*  __cdecl __MINGW_NOTHROW   __p___argc(void);
 extern char*** __cdecl __MINGW_NOTHROW  __p___argv(void);
@@ -96,47 +95,17 @@ extern wchar_t***  __cdecl __MINGW_NOTHROW __p___wargv(void);
 #define __argv (*__p___argv())
 #define __wargv (*__p___wargv())
 
-#else /* !MSVCRT */
-
-#ifndef __DECLSPEC_SUPPORTED
-
-extern int*    _imp____argc_dll;
-extern char***  _imp____argv_dll;
-#define __argc (*_imp____argc_dll)
-#define __argv (*_imp____argv_dll)
-
-#else /* __DECLSPEC_SUPPORTED */
-
-__MINGW_IMPORT int    __argc_dll;
-__MINGW_IMPORT char**  __argv_dll;
-#define __argc __argc_dll
-#define __argv __argv_dll
-
-#endif /* __DECLSPEC_SUPPORTED */
-
-#endif /* __MSVCRT */
 #endif /* __STRICT_ANSI__ */
 /*
  * Also defined in ctype.h.
  */
 #ifndef MB_CUR_MAX
 #ifdef __DECLSPEC_SUPPORTED
-# ifdef __MSVCRT__
 #  define MB_CUR_MAX __mb_cur_max
    __MINGW_IMPORT int __mb_cur_max;
-# else		/* not __MSVCRT */
-#  define MB_CUR_MAX __mb_cur_max_dll
-   __MINGW_IMPORT int __mb_cur_max_dll;
-# endif		/* not __MSVCRT */
-
 #else		/* ! __DECLSPEC_SUPPORTED */
-# ifdef __MSVCRT__
    extern int* _imp____mb_cur_max;
 #  define MB_CUR_MAX (*_imp____mb_cur_max)
-# else		/* not __MSVCRT */
-   extern int*  _imp____mb_cur_max_dll;
-#  define MB_CUR_MAX (*_imp____mb_cur_max_dll)
-# endif 	/* not __MSVCRT */
 #endif  	/*  __DECLSPEC_SUPPORTED */
 #endif  /* MB_CUR_MAX */
 
@@ -159,24 +128,13 @@ extern int errno;
  * Use environ from the DLL, not as a global. 
  */
 
-#ifdef __MSVCRT__
   extern _CRTIMP char *** __cdecl __MINGW_NOTHROW __p__environ(void);
   extern _CRTIMP wchar_t *** __cdecl __MINGW_NOTHROW  __p__wenviron(void);
 # define _environ (*__p__environ())
 # define _wenviron (*__p__wenviron())
-#else /* ! __MSVCRT__ */
-# ifndef __DECLSPEC_SUPPORTED
-    extern char *** _imp___environ_dll;
-#   define _environ (*_imp___environ_dll)
-# else /* __DECLSPEC_SUPPORTED */
-    __MINGW_IMPORT char ** _environ_dll;
-#   define _environ _environ_dll
-# endif /* __DECLSPEC_SUPPORTED */
-#endif /* ! __MSVCRT__ */
 
 #define environ _environ
 
-#ifdef	__MSVCRT__
 /* One of the MSVCRTxx libraries */
 
 #ifndef __DECLSPEC_SUPPORTED
@@ -189,20 +147,6 @@ extern int errno;
 # endif /* _UWIN */
 #endif /* __DECLSPEC_SUPPORTED */
 
-#else /* ! __MSVCRT__ */
-
-/* CRTDLL run time library */
-
-#ifndef __DECLSPEC_SUPPORTED
-  extern int*	_imp___sys_nerr_dll;
-# define sys_nerr	(*_imp___sys_nerr_dll)
-#else /* __DECLSPEC_SUPPORTED */
-  __MINGW_IMPORT int	_sys_nerr_dll;
-# define sys_nerr	_sys_nerr_dll
-#endif /* __DECLSPEC_SUPPORTED */
-
-#endif /* ! __MSVCRT__ */
-
 #ifndef __DECLSPEC_SUPPORTED
 extern char***	_imp__sys_errlist;
 #define	sys_errlist	(*_imp___sys_errlist)
@@ -217,9 +161,6 @@ __MINGW_IMPORT char*	_sys_errlist[];
  * OS version and such constants.
  */
 
-#ifdef	__MSVCRT__
-/* msvcrtxx.dll */
-
 extern _CRTIMP unsigned __cdecl __MINGW_NOTHROW int*	__p__osver(void);
 extern _CRTIMP unsigned __cdecl __MINGW_NOTHROW int*	__p__winver(void);
 extern _CRTIMP unsigned __cdecl __MINGW_NOTHROW int*	__p__winmajor(void);
@@ -237,54 +178,13 @@ __MINGW_IMPORT unsigned int _winmajor;
 __MINGW_IMPORT unsigned int _winminor;
 #endif /* __DECLSPEC_SUPPORTED */
 
-#else
-/* Not msvcrtxx.dll, thus crtdll.dll */
-
-#ifndef __DECLSPEC_SUPPORTED
-
-extern unsigned int*	_imp___osver_dll;
-extern unsigned int*	_imp___winver_dll;
-extern unsigned int*	_imp___winmajor_dll;
-extern unsigned int*	_imp___winminor_dll;
-
-#define _osver		(*_imp___osver_dll)
-#define _winver		(*_imp___winver_dll)
-#define _winmajor	(*_imp___winmajor_dll)
-#define _winminor	(*_imp___winminor_dll)
-
-#else /* __DECLSPEC_SUPPORTED */
-
-__MINGW_IMPORT unsigned int	_osver_dll;
-__MINGW_IMPORT unsigned int	_winver_dll;
-__MINGW_IMPORT unsigned int	_winmajor_dll;
-__MINGW_IMPORT unsigned int	_winminor_dll;
-
-#define _osver		_osver_dll
-#define _winver		_winver_dll
-#define _winmajor	_winmajor_dll
-#define _winminor	_winminor_dll
 
-#endif /* __DECLSPEC_SUPPORTED */
-
-#endif
-
-#if defined  __MSVCRT__
 /* although the _pgmptr is exported as DATA,
  * be safe and use the access function __p__pgmptr() to get it. */
 _CRTIMP char** __cdecl __MINGW_NOTHROW __p__pgmptr(void);
 #define _pgmptr     (*__p__pgmptr())
 _CRTIMP wchar_t** __cdecl __MINGW_NOTHROW __p__wpgmptr(void);
 #define _wpgmptr    (*__p__wpgmptr())
-#else /* ! __MSVCRT__ */
-# ifndef __DECLSPEC_SUPPORTED
-  extern char** __imp__pgmptr_dll;
-# define _pgmptr (*_imp___pgmptr_dll)
-# else /* __DECLSPEC_SUPPORTED */
- __MINGW_IMPORT char* _pgmptr_dll;
-# define _pgmptr _pgmptr_dll
-# endif /* __DECLSPEC_SUPPORTED */
-/* no wide version in CRTDLL */
-#endif /* __MSVCRT__ */
 
 /*
  * This variable determines the default file mode.
@@ -292,23 +192,12 @@ _CRTIMP wchar_t** __cdecl __MINGW_NOTHROW __p__wpgmptr(void);
  */
 #if !defined (__DECLSPEC_SUPPORTED) || defined (__IN_MINGW_RUNTIME)
 
-#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 */
 
@@ -353,7 +242,6 @@ _CRTIMP double __cdecl __MINGW_NOTHROW	wcstod	(const wchar_t*, wchar_t**);
 float __cdecl __MINGW_NOTHROW wcstof( const wchar_t * __restrict__, wchar_t ** __restrict__);
 long double __cdecl __MINGW_NOTHROW wcstold (const wchar_t * __restrict__, wchar_t ** __restrict__);
 #endif /* __NO_ISOCEXT */
-#ifdef __MSVCRT__ 
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetenv(const wchar_t*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	_wputenv(const wchar_t*);
 _CRTIMP void __cdecl __MINGW_NOTHROW	_wsearchenv(const wchar_t*, const wchar_t*, wchar_t*);
@@ -361,7 +249,6 @@ _CRTIMP int __cdecl __MINGW_NOTHROW   	_wsystem(const wchar_t*);
 _CRTIMP void __cdecl __MINGW_NOTHROW    _wmakepath(wchar_t*, const wchar_t*, const wchar_t*, const wchar_t*, const wchar_t*);
 _CRTIMP void __cdecl __MINGW_NOTHROW	_wsplitpath (const wchar_t*, wchar_t*, wchar_t*, wchar_t*, wchar_t*);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW   _wfullpath (wchar_t*, const wchar_t*, size_t);
-#endif
 #define _WSTDLIB_DEFINED
 #endif
 
@@ -447,7 +334,6 @@ _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW  _itow (int, wchar_t*, int);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW  _ltow (long, wchar_t*, int);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW  _ultow (unsigned long, wchar_t*, int);
 
-#ifdef __MSVCRT__
 _CRTIMP __int64 __cdecl __MINGW_NOTHROW	_atoi64(const char *);
 _CRTIMP char* __cdecl __MINGW_NOTHROW	_i64toa(__int64, char *, int);
 _CRTIMP char* __cdecl __MINGW_NOTHROW	_ui64toa(unsigned __int64, char *, int);
@@ -493,7 +379,6 @@ typedef void
 _invalid_parameter_handler _set_invalid_parameter_handler (_invalid_parameter_handler);
 
 # endif /* __MSVCRT_VERSION__ >= 0x800 */
-#endif /* __MSVCRT__ */
 
 #ifndef	_NO_OLDNAMES
 
@@ -536,7 +421,6 @@ __CRT_INLINE long long __cdecl __MINGW_NOTHROW llabs(long long _j)
 long long  __cdecl __MINGW_NOTHROW strtoll (const char* __restrict__, char** __restrict, int);
 unsigned long long  __cdecl __MINGW_NOTHROW strtoull (const char* __restrict__, char** __restrict__, int);
 
-#if defined (__MSVCRT__) /* these are stubs for MS _i64 versions */ 
 long long  __cdecl __MINGW_NOTHROW atoll (const char *);
 
 #if !defined (__STRICT_ANSI__)
@@ -563,8 +447,6 @@ __CRT_INLINE wchar_t*  __cdecl __MINGW_NOTHROW ulltow (unsigned long long _n, wc
 #endif /* (__NO_INLINE__) */
 #endif /* (__STRICT_ANSI__)  */
 
-#endif /* __MSVCRT__ */
-
 #endif /* !__NO_ISOCEXT */
 
 
diff --git a/include/string.h b/include/string.h
index dfb9294..b530de5 100644
--- a/include/string.h
+++ b/include/string.h
@@ -73,7 +73,7 @@ _CRTIMP size_t __cdecl __MINGW_NOTHROW	strxfrm (char*, const char*, size_t);
 
 #ifndef __STRICT_ANSI__
 /*
- * Extra non-ANSI functions provided by the CRTDLL library
+ * Extra non-ANSI functions provided by the runtime library
  */
 _CRTIMP char* __cdecl __MINGW_NOTHROW	_strerror (const char *);
 _CRTIMP void* __cdecl __MINGW_NOTHROW	_memccpy (void*, const void*, int, size_t);
@@ -90,10 +90,8 @@ _CRTIMP char* __cdecl __MINGW_NOTHROW	_strset (char*, int);
 _CRTIMP char* __cdecl __MINGW_NOTHROW	_strupr (char*);
 _CRTIMP void __cdecl __MINGW_NOTHROW	_swab (const char*, char*, size_t);
 
-#ifdef __MSVCRT__
 _CRTIMP int __cdecl __MINGW_NOTHROW  _strncoll(const char*, const char*, size_t);
 _CRTIMP int __cdecl __MINGW_NOTHROW  _strnicoll(const char*, const char*, size_t);
-#endif
 
 #ifndef	_NO_OLDNAMES
 /*
@@ -156,11 +154,8 @@ _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW wcstok(wchar_t*, const wchar_t*);
 _CRTIMP size_t __cdecl __MINGW_NOTHROW	wcsxfrm(wchar_t*, const wchar_t*, size_t);
 
 #ifndef	__STRICT_ANSI__
-/*
- * Unicode versions of non-ANSI string functions provided by CRTDLL.
- */
 
-/* NOTE: _wcscmpi not provided by CRTDLL, this define is for portability */
+/* NOTE: _wcscmpi not provided by MSVCRT.DLL, this define is for portability */
 #define		_wcscmpi	_wcsicmp
 
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wcsdup (const wchar_t*);
@@ -173,14 +168,12 @@ _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wcsrev (wchar_t*);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wcsset (wchar_t*, wchar_t);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wcsupr (wchar_t*);
 
-#ifdef __MSVCRT__
 _CRTIMP int __cdecl __MINGW_NOTHROW  _wcsncoll(const wchar_t*, const wchar_t*, size_t);
 _CRTIMP int   __cdecl __MINGW_NOTHROW _wcsnicoll(const wchar_t*, const wchar_t*, size_t);
 #if __MSVCRT_VERSION__ >= 0x0700
 _CRTIMP  wchar_t* __cdecl __MINGW_NOTHROW _wcserror(int);
 _CRTIMP  wchar_t* __cdecl __MINGW_NOTHROW __wcserror(const wchar_t*);
 #endif
-#endif
 
 #ifndef	_NO_OLDNAMES
 /* NOTE: There is no _wcscmpi, but this is for compatibility. */
diff --git a/include/sys/stat.h b/include/sys/stat.h
index 1a22dfb..b39a792 100644
--- a/include/sys/stat.h
+++ b/include/sys/stat.h
@@ -130,7 +130,6 @@ struct stat
 };
 #endif /* _NO_OLDNAMES */
 
-#if defined (__MSVCRT__)
 struct _stati64 {
     _dev_t st_dev;
     _ino_t st_ino;
@@ -202,7 +201,6 @@ struct _stat64i32 {
 	__time64_t	st_ctime;
 };
 #endif /* __MSVCRT_VERSION__ >= 0x0800 */
-#endif /* __MSVCRT__ */
 #define _STAT_DEFINED
 #endif /* _STAT_DEFINED */
 
@@ -227,7 +225,6 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	stat (const char*, struct stat*);
 
 #endif	/* Not _NO_OLDNAMES */
 
-#if defined (__MSVCRT__)
 #if __MSVCRT_VERSION__ < 0x0800
 _CRTIMP int __cdecl __MINGW_NOTHROW  _fstati64(int, struct _stati64 *);
 _CRTIMP int __cdecl __MINGW_NOTHROW  _stati64(const char *, struct _stati64 *);
@@ -280,7 +277,6 @@ _CRTALIAS int __cdecl __MINGW_NOTHROW	_wstati64 (const wchar_t* _v1, struct _sta
 #endif /* __MSVCRT_VERSION__ >= 0x0800 */
 #define _WSTAT_DEFINED
 #endif /* _WSTAT_DEFIND */
-#endif /* __MSVCRT__ */
 
 #ifdef	__cplusplus
 }
diff --git a/include/sys/types.h b/include/sys/types.h
index 47cc3df..bb34549 100644
--- a/include/sys/types.h
+++ b/include/sys/types.h
@@ -72,11 +72,7 @@ typedef _off_t	off_t;
 
 #ifndef _DEV_T_
 #define	_DEV_T_
-#ifdef __MSVCRT__
 typedef unsigned int _dev_t;
-#else
-typedef short _dev_t;
-#endif
 
 #ifndef	_NO_OLDNAMES
 typedef _dev_t	dev_t;
diff --git a/include/sys/utime.h b/include/sys/utime.h
index dfbaefe..760ea5f 100644
--- a/include/sys/utime.h
+++ b/include/sys/utime.h
@@ -81,11 +81,9 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	_futime (int, struct _utimbuf*);
 
 /* The wide character version, only available for MSVCRT versions of the
  * C runtime library. */
-#ifdef __MSVCRT__
 #if __MSVCRT_VERSION__ < 0x0800
 _CRTIMP int __cdecl __MINGW_NOTHROW	_wutime (const wchar_t*, struct _utimbuf*);
 #endif
-#endif /* MSVCRT runtime */
 
 /* These require newer versions of msvcrt.dll (6.10 or higher).  */ 
 #if __MSVCRT_VERSION__ >= 0x0601
diff --git a/include/tchar.h b/include/tchar.h
index e72a8d8..5a4ef8c 100644
--- a/include/tchar.h
+++ b/include/tchar.h
@@ -179,9 +179,7 @@ typedef wchar_t _TCHAR;
 #define _wcsncnt(_wcs, _cnt) ((wcslen(_wcs)>_cnt) ? _count : wcslen(_wcs))
 #define _wcsspnp(_wcs1, _wcs2) ((*((_wcs1)+wcsspn(_wcs1,_wcs2))) ? ((_wcs1)+wcsspn(_wcs1,_wcs2)) : NULL)
 
-#if 1  /* defined __MSVCRT__ */
 /*
- *   These wide functions not in crtdll.dll.
  *   Define macros anyway so that _wfoo rather than _tfoo is undefined
  */
 #define _ttoi64     _wtoi64
@@ -262,7 +260,6 @@ typedef wchar_t _TCHAR;
 #define _tstat32i64	_wstat32i64
 #define _tstat64i32	_wstat64i32
 #endif /* __MSVCRT_VERSION__ > 0x0800 */
-#endif  /* __MSVCRT__ */
 
 /* dirent structures and functions */
 #define _tdirent	_wdirent
@@ -447,8 +444,6 @@ typedef char	_TCHAR;
 #define _trmdir	    _rmdir
 #define _tstat      _stat
 
-#if 1  /* defined __MSVCRT__ */
-/* Not in crtdll.dll. Define macros anyway? */
 #define _ttoi64     _atoi64
 #define _i64tot     _i64toa
 #define _ui64tot    _ui64toa
@@ -478,7 +473,6 @@ typedef char	_TCHAR;
 #define _tstat32i64	_stat32i64
 #define _tstat64i32	_stat64i32
 #endif /* __MSVCRT_VERSION__ > 0x0800 */
-#endif  /* __MSVCRT__ */
 
 /* dirent structures and functions */
 #define _tdirent	dirent
diff --git a/include/time.h b/include/time.h
index 8d463b0..ece1a94 100644
--- a/include/time.h
+++ b/include/time.h
@@ -194,7 +194,6 @@ _CRTALIAS struct tm*	   __cdecl __MINGW_NOTHROW	localtime (const time_t* _v)	  {
  * _tzname: standard/daylight savings time zone names (an array with two
  *          elements).
  */
-#ifdef __MSVCRT__
 
 /* These are for compatibility with pre-VC 5.0 suppied MSVCRT. */
 extern _CRTIMP int* __cdecl __MINGW_NOTHROW	__p__daylight (void);
@@ -205,62 +204,18 @@ __MINGW_IMPORT int	_daylight;
 __MINGW_IMPORT long	_timezone;
 __MINGW_IMPORT char 	*_tzname[2];
 
-#else /* not __MSVCRT (ie. crtdll) */
-
-#ifndef __DECLSPEC_SUPPORTED
-
-extern int*	_imp___daylight_dll;
-extern long*	_imp___timezone_dll;
-extern char**	_imp___tzname;
-
-#define _daylight	(*_imp___daylight_dll)
-#define _timezone	(*_imp___timezone_dll)
-#define _tzname		(*_imp___tzname)
-
-#else /* __DECLSPEC_SUPPORTED */
-
-__MINGW_IMPORT int	_daylight_dll;
-__MINGW_IMPORT long	_timezone_dll;
-__MINGW_IMPORT char*	_tzname[2];
-
-#define _daylight	_daylight_dll
-#define _timezone	_timezone_dll
-
-#endif /* __DECLSPEC_SUPPORTED */
-
-#endif /* not __MSVCRT__ */
-
 #endif	/* Not __STRICT_ANSI__ */
 
 #ifndef _NO_OLDNAMES
-
-#ifdef __MSVCRT__
-
 /* These go in the oldnames import library for MSVCRT. */
 __MINGW_IMPORT int	daylight;
 __MINGW_IMPORT long	timezone;
 __MINGW_IMPORT char 	*tzname[2];
-
-#else /* not __MSVCRT__ */
-
-/* CRTDLL is royally messed up when it comes to these macros.
-   TODO: import and alias these via oldnames import library instead 
-   of macros.  */
-
-#define daylight        _daylight
-/* NOTE: timezone not defined as macro because it would conflict with
-   struct timezone in sys/time.h.
-   Also, tzname used to a be macro, but now it's in moldname. */
-__MINGW_IMPORT char 	*tzname[2];
-
-#endif /* not __MSVCRT__ */
-
 #endif	/* Not _NO_OLDNAMES */
 
 #ifndef _WTIME_DEFINED
 /* wide function prototypes, also declared in wchar.h */
 #ifndef __STRICT_ANSI__
-#ifdef __MSVCRT__
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW	_wasctime(const struct tm*);
 #if __MSVCRT_VERSION__ < 0x0800
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW	_wctime(const time_t*);
@@ -278,7 +233,6 @@ _CRTALIAS wchar_t* __cdecl __MINGW_NOTHROW	_wctime (const time_t* _v) { return(_
 _CRTALIAS wchar_t* __cdecl __MINGW_NOTHROW	_wctime (const time_t* _v) { return(_wctime32 (_v)); }
 #endif
 #endif /* __MSVCRT_VERSION__ >= 0x0800 */
-#endif /*  __MSVCRT__ */
 #endif /* __STRICT_ANSI__ */
 _CRTIMP size_t __cdecl __MINGW_NOTHROW		wcsftime (wchar_t*, size_t, const wchar_t*, const struct tm*);
 #define _WTIME_DEFINED
diff --git a/include/wchar.h b/include/wchar.h
index fdf9728..54f0e51 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -126,7 +126,6 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	swprintf (wchar_t*, const wchar_t*, ...);
 _CRTIMP int __cdecl __MINGW_NOTHROW	vswprintf (wchar_t*, const wchar_t*, __VALIST);
 #endif
 
-#ifdef __MSVCRT__
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW fgetws (wchar_t*, int, FILE*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	fputws (const wchar_t*, FILE*);
 _CRTIMP wint_t __cdecl __MINGW_NOTHROW	getwc (FILE*);
@@ -147,7 +146,6 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	_wremove (const wchar_t*);
 _CRTIMP void __cdecl __MINGW_NOTHROW	_wperror (const wchar_t*);
 _CRTIMP FILE* __cdecl __MINGW_NOTHROW	_wpopen (const wchar_t*, const wchar_t*);
 #endif  /* __STRICT_ANSI__ */
-#endif	/* __MSVCRT__ */
 
 #ifndef __NO_ISOCEXT  /* externs in libmingwex.a */
 int __cdecl __MINGW_NOTHROW snwprintf (wchar_t*, size_t, const wchar_t*, ...);
@@ -175,7 +173,6 @@ _CRTIMP double __cdecl __MINGW_NOTHROW	wcstod (const wchar_t*, wchar_t**);
 float __cdecl __MINGW_NOTHROW wcstof (const wchar_t * __restrict__, wchar_t ** __restrict__);
 long double __cdecl __MINGW_NOTHROW wcstold (const wchar_t * __restrict__, wchar_t ** __restrict__);
 #endif /* __NO_ISOCEXT */
-#ifdef __MSVCRT__ 
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetenv(const wchar_t*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	_wputenv(const wchar_t*);
 _CRTIMP void __cdecl __MINGW_NOTHROW	_wsearchenv(const wchar_t*, const wchar_t*, wchar_t*);
@@ -183,7 +180,6 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	_wsystem(const wchar_t*);
 _CRTIMP void __cdecl __MINGW_NOTHROW	_wmakepath(wchar_t*, const wchar_t*, const wchar_t*, const wchar_t*, const wchar_t*);
 _CRTIMP void __cdecl __MINGW_NOTHROW	_wsplitpath (const wchar_t*, wchar_t*, wchar_t*, wchar_t*, wchar_t*);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wfullpath (wchar_t*, const wchar_t*, size_t);
-#endif
 _CRTIMP __int64 __cdecl _wcstoi64(const wchar_t *, wchar_t **, int);
 _CRTIMP __int64 __cdecl _wcstoi64_l(const wchar_t *, wchar_t **, int, _locale_t);
 _CRTIMP unsigned __int64 __cdecl _wcstoui64(const wchar_t *, wchar_t **, int);
@@ -193,7 +189,6 @@ _CRTIMP unsigned __int64 __cdecl _wcstoui64_l(const wchar_t *, wchar_t **, int,
 
 #ifndef _WTIME_DEFINED
 #ifndef __STRICT_ANSI__
-#ifdef __MSVCRT__
 /* wide function prototypes, also declared in time.h */
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW	_wasctime (const struct tm*);
 #if __MSVCRT_VERSION__ < 0x0800
@@ -213,7 +208,6 @@ _CRTALIAS wchar_t* __cdecl __MINGW_NOTHROW	_wctime (const time_t* _v)	{ return(_
 #endif
 #endif
 
-#endif /* __MSVCRT__ */
 #endif /* __STRICT_ANSI__ */
 _CRTIMP size_t __cdecl __MINGW_NOTHROW	wcsftime (wchar_t*, size_t, const wchar_t*, const struct tm*);
 #define _WTIME_DEFINED
@@ -244,11 +238,7 @@ _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW wcstok(wchar_t*, const wchar_t*);
 _CRTIMP size_t __cdecl __MINGW_NOTHROW	wcsxfrm(wchar_t*, const wchar_t*, size_t);
 
 #ifndef	__STRICT_ANSI__
-/*
- * Unicode versions of non-ANSI functions provided by CRTDLL.
- */
-
-/* NOTE: _wcscmpi not provided by CRTDLL, this define is for portability */
+/* NOTE: _wcscmpi not provided by runtime dll, this define is for portability */
 #define		_wcscmpi	_wcsicmp
 
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wcsdup (const wchar_t*);
@@ -261,14 +251,12 @@ _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wcsrev (wchar_t*);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wcsset (wchar_t*, wchar_t);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wcsupr (wchar_t*);
 
-#ifdef __MSVCRT__
 _CRTIMP int __cdecl __MINGW_NOTHROW  _wcsncoll(const wchar_t*, const wchar_t*, size_t);
 _CRTIMP int   __cdecl __MINGW_NOTHROW _wcsnicoll(const wchar_t*, const wchar_t*, size_t);
 #if __MSVCRT_VERSION__ >= 0x0700
 _CRTIMP  wchar_t* __cdecl __MINGW_NOTHROW _wcserror(int);
 _CRTIMP  wchar_t* __cdecl __MINGW_NOTHROW __wcserror(const wchar_t*);
 #endif
-#endif
 
 #ifndef	_NO_OLDNAMES
 /* NOTE: There is no _wcscmpi, but this is for compatibility. */
@@ -410,10 +398,7 @@ struct _wfinddata64i32_t {
 #endif
 
 /* Wide character versions. Also defined in io.h. */
-/* CHECK: I believe these only exist in MSVCRT, and not in CRTDLL. Also
-   applies to other wide character versions? */
 #if !defined (_WIO_DEFINED)
-#if defined (__MSVCRT__)
 #include <stdint.h>  /* For intptr_t.  */
 _CRTIMP int __cdecl __MINGW_NOTHROW	_waccess (const wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW	_wchmod (const wchar_t*, int);
@@ -455,19 +440,16 @@ _CRTALIAS int  __cdecl __MINGW_NOTHROW	_wfindnexti64 (long _v1, struct _wfinddat
 #endif /* !_USE_32BIT_TIME_T*/
 #endif /* __MSVCRT_VERSION__ >= 0x0800 */
 
-#endif /* defined (__MSVCRT__) */
 #define _WIO_DEFINED
 #endif /* _WIO_DEFINED */
 
 #ifndef _WDIRECT_DEFINED
 /* Also in direct.h */
-#ifdef __MSVCRT__
 _CRTIMP int __cdecl __MINGW_NOTHROW	  _wchdir (const wchar_t*);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW  _wgetcwd (wchar_t*, int);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW  _wgetdcwd (int, wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW	  _wmkdir (const wchar_t*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	  _wrmdir (const wchar_t*);
-#endif	/* __MSVCRT__ */
 #define _WDIRECT_DEFINED
 #endif /* _WDIRECT_DEFINED */
 
@@ -514,7 +496,6 @@ struct stat
 };
 #endif /* _NO_OLDNAMES */
 
-#if defined (__MSVCRT__)
 struct _stati64 {
     _dev_t st_dev;
     _ino_t st_ino;
@@ -589,13 +570,11 @@ struct _stat64i32 {
 };
 #endif /* __MSVCRT_VERSION__ >= 0x0800 */
 
-#endif  /* __MSVCRT__ */
 #define _STAT_DEFINED
 #endif /* _STAT_DEFINED */
 
 #if !defined ( _WSTAT_DEFINED)
 /* also declared in sys/stat.h */
-#if defined __MSVCRT__
 #if __MSVCRT_VERSION__ < 0x0800
 _CRTIMP int __cdecl __MINGW_NOTHROW	_wstat (const wchar_t*, struct _stat*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	_wstati64 (const wchar_t*, struct _stati64*);
@@ -615,7 +594,6 @@ _CRTALIAS int __cdecl __MINGW_NOTHROW	_wstat (const wchar_t* _v1, struct _stat*
 _CRTALIAS int __cdecl __MINGW_NOTHROW	_wstati64 (const wchar_t* _v1, struct _stati64* _v2) { return(_wstat32i64 (_v1,(struct _stat32i64*)_v2)); }
 #endif /* !_USE_32BIT_TIME_T */
 #endif /* __MSVCRT_VERSION__ >= 0x0800 */
-#endif  /* __MSVCRT__ */
 #define _WSTAT_DEFINED
 #endif /* ! _WSTAT_DEFIND  */
 
diff --git a/include/wctype.h b/include/wctype.h
index 786faf4..b65ef35 100644
--- a/include/wctype.h
+++ b/include/wctype.h
@@ -100,25 +100,14 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	isleadbyte (int);
 # if __MSVCRT_VERSION__ <= 0x0700
   __MINGW_IMPORT unsigned short _ctype[];
 # endif 
-# ifdef __MSVCRT__
   __MINGW_IMPORT unsigned short* _pctype;
-# else	/* CRTDLL */
-  __MINGW_IMPORT unsigned short* _pctype_dll;
-# define  _pctype _pctype_dll
-# endif
-
 #else		/* ! __DECLSPEC_SUPPORTED */
 # if __MSVCRT_VERSION__ <= 0x0700
   extern unsigned short** _imp___ctype;
 # define _ctype (*_imp___ctype)
 # endif
-# ifdef __MSVCRT__
   extern unsigned short** _imp___pctype;
 # define _pctype (*_imp___pctype)
-# else	/* CRTDLL */
-  extern unsigned short** _imp___pctype_dll;
-# define _pctype (*_imp___pctype_dll)
-# endif	/* CRTDLL */
 #endif		/*  __DECLSPEC_SUPPORTED */
 
 
diff --git a/lib/lib32/moldname.def.in b/lib/lib32/moldname.def.in
index b8bae6b..82d194b 100644
--- a/lib/lib32/moldname.def.in
+++ b/lib/lib32/moldname.def.in
@@ -31,9 +31,7 @@ chsize
 close
 creat
 cwait
-#if !(__CRTDLL__)
 daylight DATA
-#endif
 dup
 dup2
 ecvt
@@ -110,9 +108,7 @@ strupr
 swab
 tell
 tempnam
-#if  !(__CRTDLL__)
 timezone DATA
-#endif
 ; export tzname for both. See <time.h>
 tzname DATA
 tzset
@@ -129,9 +125,7 @@ wcsnset
 wcsrev
 wcsset
 wcsupr
-#if  !(__CRTDLL__)
 wpopen
-#endif
 write
 ; non-ANSI functions declared in math.h
 j0
diff --git a/src/libcrt/crt/crt1.c b/src/libcrt/crt/crt1.c
index ab73b50..424ed21 100644
--- a/src/libcrt/crt/crt1.c
+++ b/src/libcrt/crt/crt1.c
@@ -59,21 +59,17 @@ extern const PIMAGE_TLS_CALLBACK __dyn_tls_init_callback;
  * Must have the correct app type for MSVCRT. 
  */
 
-#ifdef __MSVCRT__
 #define __UNKNOWN_APP    0
 #define __CONSOLE_APP    1
 #define __GUI_APP        2
 __MINGW_IMPORT void __set_app_type(int);
-#endif /* __MSVCRT__ */
 
 /*  Global _fmode for this .exe, not the one in msvcrt.dll,
     The default is set in txtmode.o in libmingw32.a */
 /* Override the dllimport'd declarations in stdlib.h */
 #undef _fmode 
 extern int _fmode; 
-#ifdef __MSVCRT__
 extern int* __p__fmode(void); /* To access the dll _fmode */
-#endif
 
 /*
  * Setup the default file handles to have the _CRT_fmode mode, as well as
@@ -111,11 +107,7 @@ _mingw32_init_fmode (void)
     }
 
     /*  Now sync  the dll _fmode to the  one for this .exe.  */
-#ifdef __MSVCRT__
     *__p__fmode() = _fmode;	
-#else
-    *_imp___fmode_dll = _fmode;
-#endif
 }
 
 /* This function will be called when a trap occurs. Thanks to Jacob
@@ -276,9 +268,7 @@ __mingw_CRTStartup (void)
 void
 mainCRTStartup (void)
 {
-#ifdef __MSVCRT__
   __set_app_type (__CONSOLE_APP);
-#endif
   __mingw_CRTStartup ();
 }
 
@@ -290,9 +280,7 @@ mainCRTStartup (void)
 void
 WinMainCRTStartup (void)
 {
-#ifdef __MSVCRT__
   __set_app_type (__GUI_APP);
-#endif
   __mingw_CRTStartup ();
 }
 
diff --git a/src/libcrt/crt/init.c b/src/libcrt/crt/init.c
index 61522b0..01230bd 100644
--- a/src/libcrt/crt/init.c
+++ b/src/libcrt/crt/init.c
@@ -48,14 +48,10 @@ char **_argv = 0;
  */
 extern int _CRT_glob;
 
-#ifdef __MSVCRT__
 typedef struct {
   int newmode;
 } _startupinfo;
 extern void __getmainargs (int *, char ***, char ***, int, _startupinfo *);
-#else
-extern void __GetMainArgs (int *, char ***, char ***, int);
-#endif
 
 /*
  * Initialize the _argc, _argv and environ variables.
@@ -66,20 +62,13 @@ _mingw32_init_mainargs ()
   /* The environ variable is provided directly in stdlib.h through
    * a dll function call. */
   char **dummy_environ;
-#ifdef __MSVCRT__
   _startupinfo start_info;
   start_info.newmode = 0;
-#endif
 
   /*
    * Microsoft's runtime provides a function for doing just that.
    */
-#ifdef __MSVCRT__
   (void) __getmainargs (&_argc, &_argv, &dummy_environ, _CRT_glob, 
                         &start_info);
-#else
-  /* CRTDLL version */
-  (void) __GetMainArgs (&_argc, &_argv, &dummy_environ, _CRT_glob);
-#endif
 }
 
diff --git a/src/libcrt/crt/ofmt_stub.s b/src/libcrt/crt/ofmt_stub.s
index 3f797b4..d8b97b1 100644
--- a/src/libcrt/crt/ofmt_stub.s
+++ b/src/libcrt/crt/ofmt_stub.s
@@ -30,7 +30,6 @@
  * versions of MSVCRT, (those which do not already advertise availability of
  * any exported _get_output_format() function); this will permit _pformat()
  * to transparently interoperate with all supported versions of MSVCRT.
- * (Likewise for CRTDLL).
  */
 	.text
 	.p2align 1,,4
diff --git a/src/libcrt/crt/tlssup.c b/src/libcrt/crt/tlssup.c
index 2141b2e..9f1225b 100644
--- a/src/libcrt/crt/tlssup.c
+++ b/src/libcrt/crt/tlssup.c
@@ -21,10 +21,6 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#ifdef CRTDLL
-#undef CRTDLL
-#endif
-
 #include <windows.h>
 #include <stdio.h>
 #include <memory.h>

http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw.org-wsl;a=commitdiff;h=

commit fd0c88828fac399eb5b703354584b6fdc03b8e93
Author: Earnie Boyd <ea...@us...>
Date:   Fri Sep 7 10:36:34 2012 -0400

    	Remove filters for CRTDLL and __MSVCRT__.
    
    	* Makefile.in: Remove -[DU]__MSVCRT__ and -[DU]__CRTDLL__.
    	* crt1.o: Remove CRTDLL specific target.
    	* dllcrt1.o: Ditto.
    	* gcrt1.o: Ditto.
    	* include/assert.h: Modify documentation to remove the use of CRTDLL.
    	* include/setjmp.h: Ditto.
    	* src/libcrt/crt/ofmt_stub.s: Ditto.
    	* include/ctype.h: Ditto.
    	Remove filters for __MSVCRT__ and unneeded #else coding.
    	* include/dirent.h: Ditto.
    	* include/dos.h: Ditto.
    	* include/io.h: Ditto.
    	* include/math.h: Ditto.
    	* include/process.h: Ditto.
    	* include/stdio.h: Ditto.
    	* include/stdlib.h: Ditto.
    	* include/string.h: Ditto.
    	* include/sys/stat.h: Ditto.
    	* include/sys/types.h: Ditto.
    	* include/sys/utime.h: Ditto.
    	* include/tchar.h: Ditto.
    	* include/time.h: Ditto.
    	* include/wchar.h: Ditto.
    	* include/wctype.h: Ditto.
    	* src/libcrt/crt/crt1.c: Ditto.
    	* src/libcrt/crt/init.c: Ditto.
    	* lib/lib32/moldname.def.in: Remove filters for __CRTDLL__.
    	* src/libcrt/tlssup.c: Remove filter for CRTDLL.

diff --git a/ChangeLog b/ChangeLog
index 456f89f..7f5dc47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,38 @@
 2012-09-07  Earnie Boyd  <ea...@us...>
 
+	Remove filters for CRTDLL and __MSVCRT__.
+
+	* Makefile.in: Remove -[DU]__MSVCRT__ and -[DU]__CRTDLL__.
+	* crt1.o: Remove CRTDLL specific target.
+	* dllcrt1.o: Ditto.
+	* gcrt1.o: Ditto.
+	* include/assert.h: Modify documentation to remove the use of CRTDLL.
+	* include/setjmp.h: Ditto.
+	* src/libcrt/crt/ofmt_stub.s: Ditto.
+	* include/ctype.h: Ditto.
+	Remove filters for __MSVCRT__ and unneeded #else coding.
+	* include/dirent.h: Ditto.
+	* include/dos.h: Ditto.
+	* include/io.h: Ditto.
+	* include/math.h: Ditto.
+	* include/process.h: Ditto.
+	* include/stdio.h: Ditto.
+	* include/stdlib.h: Ditto.
+	* include/string.h: Ditto.
+	* include/sys/stat.h: Ditto.
+	* include/sys/types.h: Ditto.
+	* include/sys/utime.h: Ditto.
+	* include/tchar.h: Ditto.
+	* include/time.h: Ditto.
+	* include/wchar.h: Ditto.
+	* include/wctype.h: Ditto.
+	* src/libcrt/crt/crt1.c: Ditto.
+	* src/libcrt/crt/init.c: Ditto.
+	* lib/lib32/moldname.def.in: Remove filters for __CRTDLL__.
+	* src/libcrt/tlssup.c: Remove filter for CRTDLL.
+
+2012-09-07  Earnie Boyd  <ea...@us...>
+
 	Apply LICENSE to all files as appropriate.
 
 	* tests/Makefile.in: Add file preamble.
diff --git a/Makefile.in b/Makefile.in
index 9a8d6e8..d32a229 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -626,7 +626,7 @@ $(msvcrt_DEF): lib/lib32/msvcrt.def.in
 	$(CC) -DRUNTIME=$(basename $(notdir $@)) \
 		-D__FILENAME__=$@ \
 		-D__$(basename $(notdir $@))__=1 \
-		-D__MSVCRT__ -C -E -P -xc-header \
+		-C -E -P -xc-header \
 		$? > $@
 
 
@@ -641,7 +641,7 @@ $(moldname_DEF): lib/lib32/moldname.def.in
 	$(CC) -DRUNTIME=$(basename $(notdir $@)) \
 		-D__FILENAME__=$$F \
 		-D__$(basename $(notdir $@))__=1 \
-		-D__MSVCRT__ -C -E -P -xc-header \
+		-C -E -P -xc-header \
 		$? > $@
 
 SRCDIR := lib/lib32
@@ -693,13 +693,9 @@ lib%.a: %.o
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 SRCDIR := src/libcrt/crt
-$(SRCDIR)/crt1.o $(SRCDIR)/dllcrt1.o:
-	$(MKDIR_P) $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $<
-
 $(SRCDIR)/crt2.o $(SRCDIR)/dllcrt2.o:
 	$(MKDIR_P) $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -D__MSVCRT__ -U__CRTDLL__ -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 $(SRCDIR)/crt1.o: $(SRCDIR)/crt1.c
 $(SRCDIR)/dllcrt1.o: $(SRCDIR)/dllcrt1.c
@@ -716,13 +712,9 @@ $(libscrnsavw_a_OBJECTS): $(libscrnsavw_a_SOURCES)
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $(scrnsavw_o_CFLAGS) -o $@ $<
 
 SRCDIR := misc/gpl/profile
-$(SRCDIR)/gcrt1.o:
-	mkdir -p $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -U__MSVCRT__ -D__CRTDLL__ -o $@ $<
-
 $(SRCDIR)/gcrt2.o:
 	mkdir -p $(@D)
-	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -D__MSVCRT__ -U__CRTDLL__ -o $@ $<
+	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -o $@ $<
 
 $(SRCDIR)/gcrt1.o $(SRCDIR)/gcrt2.o: $(SRCDIR)/gcrt0.c
 
diff --git a/include/assert.h b/include/assert.h
index 1eddeed..6f9cdd0 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -53,7 +53,7 @@ extern "C" {
 #else /* debugging enabled */
 
 /*
- * CRTDLL nicely supplies a function which does the actual output and
+ * The runtime nicely supplies a function which does the actual output and
  * call to abort.
  */
 _CRTIMP void __cdecl __MINGW_NOTHROW _assert (const char*, const char*, int) __MINGW_ATTRIB_NORETURN;
diff --git a/include/ctype.h b/include/ctype.h
index 28ca1a9..e744a09 100644
--- a/include/ctype.h
+++ b/include/ctype.h
@@ -90,7 +90,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW toupper(int);
 
 /*
  * NOTE: The above are not old name type wrappers, but functions exported
- * explicitly by MSVCRT/CRTDLL. However, underscored versions are also
+ * explicitly by MSVCRT.DLL. However, underscored versions are also
  * exported.
  */
 #ifndef	__STRICT_ANSI__
@@ -105,22 +105,11 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int);
 /* Also defined in stdlib.h */
 #ifndef MB_CUR_MAX
 #ifdef __DECLSPEC_SUPPORTED
-# ifdef __MSVCRT__
-#  define MB_CUR_MAX __mb_cur_max
    __MINGW_IMPORT int __mb_cur_max;
-# else	/* not __MSVCRT */
-#  define MB_CUR_MAX __mb_cur_max_dll
-   __MINGW_IMPORT int __mb_cur_max_dll;
-# endif	/* not __MSVCRT */
-
+#  define MB_CUR_MAX __mb_cur_max
 #else		/* ! __DECLSPEC_SUPPORTED */
-# ifdef __MSVCRT__
    extern int* _imp____mb_cur_max;
 #  define MB_CUR_MAX (*_imp____mb_cur_max)
-# else		/* not __MSVCRT */
-   extern int*  _imp____mb_cur_max_dll;
-#  define MB_CUR_MAX (*_imp____mb_cur_max_dll)
-# endif 	/* not __MSVCRT */
 #endif  	/*  __DECLSPEC_SUPPORTED */
 #endif  /* MB_CUR_MAX */
 
@@ -129,25 +118,15 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _toupper(int);
 # if __MSVCRT_VERSION__ <= 0x0700
   __MINGW_IMPORT unsigned short _ctype[];
 # endif
-# ifdef __MSVCRT__
   __MINGW_IMPORT unsigned short* _pctype;
-# else /* CRTDLL */
-  __MINGW_IMPORT unsigned short* _pctype_dll;
-# define  _pctype _pctype_dll
-# endif 
 
 #else		/*  __DECLSPEC_SUPPORTED */
 # if __MSVCRT_VERSION__ <= 0x0700
   extern unsigned short** _imp___ctype;
 # define _ctype (*_imp___ctype)
 # endif
-# ifdef __MSVCRT__
   extern unsigned short** _imp___pctype;
 # define _pctype (*_imp___pctype)
-# else /* CRTDLL */
-  extern unsigned short** _imp___pctype_dll;
-# define _pctype (*_imp___pctype_dll)
-# endif /* CRTDLL */
 #endif		/*  __DECLSPEC_SUPPORTED */
 
 /*
diff --git a/include/direct.h b/include/direct.h
index 149b8ed..5c576f5 100644
--- a/include/direct.h
+++ b/include/direct.h
@@ -68,13 +68,11 @@ _CRTIMP unsigned __cdecl __MINGW_NOTHROW _getdiskfree (unsigned, struct _diskfre
 
 #ifndef _WDIRECT_DEFINED
 /* wide character versions. Also in wchar.h */
-#ifdef __MSVCRT__ 
 _CRTIMP int __cdecl __MINGW_NOTHROW _wchdir(const wchar_t*);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetcwd(wchar_t*, int);
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW _wgetdcwd(int, wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wmkdir(const wchar_t*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wrmdir(const wchar_t*);
-#endif	/* __MSVCRT__ */
 #define _WDIRECT_DEFINED
 #endif
 
diff --git a/include/dos.h b/include/dos.h
index 25d06d4..e2c629f 100644
--- a/include/dos.h
+++ b/include/dos.h
@@ -46,41 +46,6 @@
 extern "C" {
 #endif
 
-#ifndef __MSVCRT__ /* these are in CRTDLL, but not MSVCRT */
-#ifndef __DECLSPEC_SUPPORTED
-extern unsigned int *_imp___basemajor_dll;
-extern unsigned int *_imp___baseminor_dll;
-extern unsigned int *_imp___baseversion_dll;
-extern unsigned int *_imp___osmajor_dll;
-extern unsigned int *_imp___osminor_dll;
-extern unsigned int *_imp___osmode_dll;
-
-#define _basemajor (*_imp___basemajor_dll)
-#define _baseminor (*_imp___baseminor_dll)
-#define _baseversion (*_imp___baseversion_dll)
-#define _osmajor (*_imp___osmajor_dll)
-#define _osminor (*_imp___osminor_dll)
-#define _osmode (*_imp___osmode_dll)
-
-#else /* __DECLSPEC_SUPPORTED */
-
-__MINGW_IMPORT unsigned int _basemajor_dll;
-__MINGW_IMPORT unsigned int _baseminor_dll;
-__MINGW_IMPORT unsigned int _baseversion_dll;
-__MINGW_IMPORT unsigned int _osmajor_dll;
-__MINGW_IMPORT unsigned int _osminor_dll;
-__MINGW_IMPORT unsigned int _osmode_dll;
-
-#define _basemajor _basemajor_dll
-#define _baseminor _baseminor_dll
-#define _baseversion _baseversion_dll
-#define _osmajor _osmajor_dll
-#define _osminor _osminor_dll
-#define _osmode _osmode_dll
-
-#endif /* __DECLSPEC_SUPPORTED */
-#endif /* ! __MSVCRT__ */
-
 #ifndef _DISKFREE_T_DEFINED
 /* needed by _getdiskfree (also in direct.h) */
 struct _diskfree_t {
diff --git a/include/io.h b/include/io.h
index 521871e..77e4559 100644
--- a/include/io.h
+++ b/include/io.h
@@ -267,7 +267,6 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _mkdir (const char*);
 _CRTIMP char* __cdecl __MINGW_NOTHROW _mktemp (char*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _rmdir (const char*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _chmod (const char*, int);
-#ifdef __MSVCRT__
 _CRTIMP __int64 __cdecl __MINGW_NOTHROW _filelengthi64(int);
 #if __MSVCRT_VERSION__ < 0x0800
 _CRTIMP intptr_t __cdecl __MINGW_NOTHROW _findfirsti64(const char*, struct _finddatai64_t*);
@@ -306,8 +305,6 @@ __CRT_INLINE off64_t lseek64 (int fd, off64_t offset, int whence)
 }
 #endif
 
-#endif /* __MSVCRT__ */
-
 #ifndef _NO_OLDNAMES
 
 #ifndef _UWIN
@@ -398,9 +395,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW _unlink (const char*);
 _CRTIMP int __cdecl __MINGW_NOTHROW _write (int, const void*, unsigned int);
 
 /* Wide character versions. Also declared in wchar.h. */
-/* Not in crtdll.dll */
 #if !defined (_WIO_DEFINED)
-#if defined (__MSVCRT__)
 _CRTIMP int __cdecl __MINGW_NOTHROW _waccess(const wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wchmod(const wchar_t*, int);
 _CRTIMP int __cdecl __MINGW_NOTHROW _wcreat(const wchar_t*, int);
@@ -441,7 +436,6 @@ _CRTALIAS intptr_t __cdecl __MINGW_NOTHROW _wfindfirsti64 (const wchar_t* _v1, s
 _CRTALIAS int  __cdecl __MINGW_NOTHROW	_wfindnexti64 (intptr_t _v1, struct _wfinddatai64_t* _v2)	 { return(_wfindnext32i64  (_v1,(struct _wfinddata32i64_t*)_v2)); }
 #endif /* !_USE_32BIT_TIME_T */
 #endif /* __MSVCRT_VERSION__ >= 0x0800 */
-#endif /* defined (__MSVCRT__) */
 #define _WIO_DEFINED
 #endif /* _WIO_DEFINED */
 
diff --git a/include/math.h b/include/math.h
index 03f6bd0..f286999 100644
--- a/include/math.h
+++ b/include/math.h
@@ -106,8 +106,6 @@ extern "C" {
  * __imp__HUGE is a pointer to the actual variable _HUGE in
  * MSVCRT.DLL. If we used _HUGE directly we would get a pointer
  * to a thunk function.
- *
- * NOTE: The CRTDLL version uses _HUGE_dll instead.
  */
 
 #if __MINGW_GNUC_PREREQ(3, 3)
@@ -116,25 +114,13 @@ extern "C" {
 
 #ifndef __DECLSPEC_SUPPORTED
 
-#ifdef __MSVCRT__
 extern double*	_imp___HUGE;
 #define	HUGE_VAL	(*_imp___HUGE)
-#else
-/* CRTDLL */
-extern double*	_imp___HUGE_dll;
-#define	HUGE_VAL	(*_imp___HUGE_dll)
-#endif
 
 #else /* __DECLSPEC_SUPPORTED */
 
-#ifdef __MSVCRT__
 __MINGW_IMPORT double	_HUGE;
 #define	HUGE_VAL	_HUGE
-#else
-/* CRTDLL */
-__MINGW_IMPORT double	_HUGE_dll;
-#define	HUGE_VAL	_HUGE_dll
-#endif
 
 #endif /* __DECLSPEC_SUPPORTED */
 #endif /* __MINGW_GNUC_PREREQ(3, 3) */
diff --git a/include/process.h b/include/process.h
index c8cbb1d..094e644 100644
--- a/include/process.h
+++ b/include/process.h
@@ -121,9 +121,6 @@ _CRTIMP intptr_t __cdecl __MINGW_NOTHROW _wspawnvpe	(int, const wchar_t*, const
 #endif
 
 /*
- * The functions _beginthreadex and _endthreadex are not provided by CRTDLL.
- * They are provided by MSVCRT.
- *
  * NOTE: Apparently _endthread calls CloseHandle on the handle of the thread,
  * making for race conditions if you are not careful. Basically you have to
  * make sure that no-one is going to do *anything* with the thread handle
@@ -135,13 +132,10 @@ _CRTIMP unsigned long __cdecl __MINGW_NOTHROW
 	_beginthread	(void (*)(void *), unsigned, void*);
 _CRTIMP void __cdecl __MINGW_NOTHROW _endthread	(void);
 
-#ifdef	__MSVCRT__
 _CRTIMP unsigned long __cdecl __MINGW_NOTHROW
 	_beginthreadex	(void *, unsigned, unsigned (__stdcall *) (void *), 
 			 void*, unsigned, unsigned*);
 _CRTIMP void __cdecl __MINGW_NOTHROW _endthreadex (unsigned);
-#endif
-
 
 #ifndef	_NO_OLDNAMES
 /*
diff --git a/include/setjmp.h b/include/setjmp.h
index 0c694bb..ed5e802 100644
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -46,7 +46,7 @@ extern "C" {
 typedef _JBTYPE jmp_buf[_JBLEN];
 
 /*
- * The function provided by CRTDLL which appears to do the actual work
+ * The function provided by MSVCRT.DLL which appears to do the actual work
  * of setjmp.
  */
 _CRTIMP int __cdecl __MINGW_NOTHROW _setjmp (jmp_buf);
diff --git a/include/stdio.h b/include/stdio.h
index a6d7112..d81b29a 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -461,15 +461,10 @@ size_t __cdecl __MINGW_NOTHROW __mingw_fwrite (const void*, size_t, size_t, FILE
  * this type are unknown, but we (the compiler) need to know the size
  * because the programmer using fgetpos and fsetpos will be setting aside
  * storage for fpos_t structres. Actually I tested using a byte array and
- * it is fairly evident that the fpos_t type is a long (in CRTDLL.DLL).
- * Perhaps an unsigned long? TODO? It's definitely a 64-bit number in
+ * it is fairly evident that the fpos_t it's a 64-bit number in
  * MSVCRT however, and for now `long long' will do.
  */
-#ifdef __MSVCRT__
 typedef long long fpos_t;
-#else
-typedef long	fpos_t;
-#endif
 
 _CRTIMP int __cdecl __MINGW_NOTHROW	fgetpos	(FILE*, fpos_t*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	fsetpos (FILE*, const fpos_t*);
@@ -517,10 +512,8 @@ _CRTIMP FILE* __cdecl __MINGW_NOTHROW	_fdopen (int, const char*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	_fileno (FILE*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	_fcloseall (void);
 _CRTIMP FILE* __cdecl __MINGW_NOTHROW	_fsopen (const char*, const char*, int);
-#ifdef __MSVCRT__
 _CRTIMP int __cdecl __MINGW_NOTHROW	_getmaxstdio (void);
 _CRTIMP int __cdecl __MINGW_NOTHROW	_setmaxstdio (int);
-#endif
 
 #if __MSVCRT_VERSION__ >= 0x800
 _CRTIMP unsigned int __cdecl __MINGW_NOTHROW _get_output_format (void);
@@ -544,7 +537,7 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	fileno (FILE*);
 #define fileno(__F) ((__F)->_file)
 #endif
 
-#if defined (__MSVCRT__) && !defined (__NO_MINGW_LFS)
+#if !defined (__NO_MINGW_LFS)
 #include <sys/types.h>
 __CRT_INLINE FILE* __cdecl __MINGW_NOTHROW fopen64 (const char*, const char*);
 __CRT_INLINE FILE* __cdecl __MINGW_NOTHROW fopen64 (const char* filename, const char* mode)
@@ -557,7 +550,7 @@ int __cdecl __MINGW_NOTHROW fseeko64 (FILE*, off64_t, int);
 #ifdef __USE_MINGW_FSEEK
 int __cdecl __MINGW_NOTHROW __mingw_fseeko64 (FILE *, off64_t, int);
 #define fseeko64(fp, offset, whence)  __mingw_fseeko64(fp, offset, whence)
-#endif
+#endif /* __USER_MINGW_FSEEK */
 
 __CRT_INLINE off64_t __cdecl __MINGW_NOTHROW ftello64 (FILE *);
 __CRT_INLINE off64_t __cdecl __MINGW_NOTHROW ftello64 (FILE * stream)
@@ -596,7 +589,6 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	swprintf (wchar_t*, const wchar_t*, ...);
 _CRTIMP int __cdecl __MINGW_NOTHROW	vswprintf (wchar_t*, const wchar_t*, __VALIST);
 #endif
 
-#ifdef __MSVCRT__ 
 _CRTIMP wchar_t* __cdecl __MINGW_NOTHROW fgetws (wchar_t*, int, FILE*);
 _CRTIMP int __cdecl __MINGW_NOTHROW	fputws (const wchar_t*, FILE*);
 _CRTIMP wint_t __cdecl __MINGW_NOTHROW	getwc (FILE*);
@@ -619,7 +611,6 @@ _CRTIMP int __cdecl __MINGW_NOTHROW	_wremove (const wchar_t*);
 _CRTIMP void __cdecl __MINGW_NOTHROW	_wperror (const wchar_t*);
 _CRTIMP FILE* __cdecl __MINGW_NOTHROW	_wpopen (const wchar_t*, const wchar_t*);
 #endif  /* __STRICT_ANSI__ */
-#endif	/* __MSVCRT__ */
 
 #ifndef __NO_ISOCEXT  /* externs in libmingwex.a */
 int __cdecl __MINGW_NOTHROW snwprintf (wchar_t* s, size_t n, const wchar_t*  format, ...);
@@ -640,11 +631,9 @@ int __cdecl __MINGW_NOTHROW vswscanf (const wchar_t * __restrict__,
 #endif /* _WSTDIO_DEFINED */
 
 #ifndef __STRICT_ANSI__
-#ifdef __MSVCRT__
 #ifndef NO_OLDNAMES
 _CRTIMP FILE* __cdecl __MINGW_NOTHROW	wpopen (const wchar_t*, const wchar_t*);
 #endif /* not NO_OLDNAMES */
-#endif /* MSVCRT runtime */
 
 /*
  * Other Non ANSI wide functions
diff --git a/include/stdlib.h b/include/stdlib.h
index 2105b86..d0b7cb8 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -86,7 +86,6 @@ extern int	_argc;
 extern char**	_argv;
 
 /* imports from runtime dll of the above variables */
-#ifdef __MSVCRT__
 
 extern int*  __cdecl __MINGW_NOTHROW   __p___argc(void);
 extern char*** __cdecl __MINGW_NO...
 
[truncated message content]

[MinGW-cvs] [git push mingw-dist]Repository: mingw-dist branch master updated. 137771e800d6376511bd12e9743a3001c5be45bd

From: Keith M. <no...@so...> - 2012-09-07 18:37:38

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw-dist".

The branch, master has been updated
       via  137771e800d6376511bd12e9743a3001c5be45bd (commit)
      from  a2339e71b822f128a145265bc980c6a286d893b1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw-dist;a=commitdiff;h=

commit 137771e800d6376511bd12e9743a3001c5be45bd
Author: Keith Marshall <kei...@us...>
Date:   Fri Sep 7 19:37:12 2012 +0100

    Add support files for git and Mercurial.

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..df85333
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+CVS
+build
+configure
+autom4te.cache
+.hgtags
+.hg
diff --git a/.hgignore b/.hgignore
new file mode 100644
index 0000000..ccec889
--- /dev/null
+++ b/.hgignore
@@ -0,0 +1,8 @@
+syntax: glob
+.git/
+autom4te.cache/
+configure
+build/
+**.orig
+.#**
+CVS/
diff --git a/ChangeLog b/ChangeLog
index 14142ca..09db453 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-07  Keith Marshall  <kei...@us...>
+
+	Add support files for git and Mercurial.
+
+	* .gitignore .hgignore: New files.
+
 2012-09-02  Chris Sutcliffe  <ir0...@us...>
 
 	Update & publish mingw32-make.

-----------------------------------------------------------------------

Summary of changes:
 .gitignore |    6 ++++++
 .hgignore  |    8 ++++++++
 ChangeLog  |    6 ++++++
 3 files changed, 20 insertions(+), 0 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 .hgignore


hooks/post-receive
-- 
Repository: mingw-dist

Flat | Threaded

1 2 > >> (Page 1 of 2)

S	M	T	W	T	F	S
						1
2 (6)	3	4 (3)	5 (2)	6	7 (4)	8 (1)
9 (4)	10 (1)	11 (2)	12 (3)	13 (1)	14	15
16	17 (1)	18 (1)	19 (1)	20 (1)	21 (2)	22
23	24	25	26 (1)	27 (4)	28	29
30