2012-08-01  Ozkan Sezer  <sezeroz@gmail.com>

	Merge from trunk rev. 5245:
	Kai Tietz  <ktietz@redhat.com>
	* msxml.h, msxml2.h: Make abort agnostic against user-defines.

	Merge from trunk rev. 5236:
	Corinna Vinschen  <vinschen@redhat.com>
	* usb.h: Check for _WIN64 instead of WIN64.

2012-07-11  Ozkan Sezer  <sezeroz@gmail.com>

	* tapi.h: Move the unicode A/W macros after the function prototypes.
	(lineAddProvider,lineBlindTransfer,lineConfigDialog,
	lineConfigDialogEdit,lineDial,lineGatherDigits,lineGenerateDigits,
	lineGetAddressID,lineGetAppPriority,lineGetDevConfig,lineGetIcon,
	lineGetID,lineHandoff,lineMakeCall,linePark,linePickup,lineRedirect,
	lineSetAppPriority,lineSetDevConfig,lineSetTollList,
	lineTranslateAddress,lineTranslateDialog,lineUnpark,phoneConfigDialog,
	phoneGetIcon,phoneGetID,tapiGetLocationInfo,tapiRequestMakeCall,
	tapiRequestMediaCall): Define as *A variant only for TAPI2 or newer,
	but always define as *W variant when UNICODE is defined.

2012-06-27  Corinna Vinschen  <vinschen@redhat.com>

	* include/stralign.h: Fix and add #endif comments.

2012-05-09  Ozkan Sezer  <sezeroz@gmail.com>

	* winuser.h: Merge from trunk revs. 4406, 4810, 4985: Add missing
	MAPVK_VK_TO_* definitions. Add new HTOUCHINPUT declaration.

2012-05-07  Ozkan Sezer  <sezeroz@gmail.com>

	* dwmapi.h: Fixed all function prototypes to be WINAPI.

2012-04-10  Ozkan Sezer  <sezeroz@gmail.com>

	* _mingw.h (__int128, __SIZEOF_INT128__): Handle clang.

2012-01-19  Kai Tietz  <ktietz@redhat.com>

	PR 3474190
	* windef.h (STRICT): Regard definition of NO_STRICT.

2012-01-06  Ozkan Sezer  <sezeroz@gmail.com>

	* winuser.h: Fix several typos found by Rinrin <rinrin@imbrian.org>:
	(TOUCHEVENTMASKF_TIMEFROMSYSTEM): Rename to
	 TOUCHINPUTMASKF_TIMEFROMSYSTEM.
	(TOUCHEVENTMASKF_EXTRAINFO): Rename to TOUCHINPUTMASKF_EXTRAINFO.
	(TOUCHEVENTMASKF_CONTACTAREA): Rename to TOUCHINPUTMASKF_CONTACTAREA.
	(struct _TOUCHINPUT): Fix member name from wMask to dwMask.

2012-01-04  Ozkan Sezer  <sezeroz@gmail.com>

	* wingdi.h: Uglify the function param names a bit for bug #3469308

2011-12-17  Jonathan Liu  <net147@users.sourceforge.net>

	* sys/timeb.h (_ftime): Fix default definition for 32-bit vs.
	64-bit Windows.
	(_timeb): Likewise.

2011-12-16  Ozkan Sezer  <sezeroz@gmail.com>

	* limits.h (SSIZE_MAX): Move out of special case of _POSIX_ being
	defined.  Define as INT_MAX for win32 and as _I64_MAX for win64.

2011-11-17  Ozkan Sezer  <sezeroz@gmail.com>

	Merge from the trunk:
	2011-10-10  Kai Tietz  <ktietz@redhat.com> (rev. 3715)
	* guiddef.h (CLSID): Guard by CLSID_DEFINED.

2011-11-16  Ozkan Sezer  <sezeroz@gmail.com>

	* wincon.h (SetConsoleDisplayMode): Add missing prototype from
	http://msdn.microsoft.com/en-us/library/ms686028(v=VS.85).aspx
	(CONSOLE_FULLSCREEN_MODE): New macro.
	(CONSOLE_WINDOWED_MODE): New macro.

2011-11-14  Ozkan Sezer  <sezeroz@gmail.com>

	* unistd.h: Define SEEK_SET, SEEK_CUR, SEEK_END, STDIN_FILENO,
	STDOUT_FILENO and STDERR_FILENO, if not already defined. Patch
	from 'antran'. Closes bug #3426006.

2011-11-14  Ozkan Sezer  <sezeroz@gmail.com>

	Merge from trunk revs. 4362, 4565, 4566, 4567:
	Rafal Carr  <funman@videolan.org>
	Kai Tietz  <ktietz@redhat.com>
	* _mingw_print_push.h, _mingw_print_pop.h, stdio.h, wchar.h:
	Replace printf macro overrides via aliases. Replace __forceinline by
	'static __attribute__((__unused__))' for functions using variable
	arguments.

2011-11-13  Ozkan Sezer  <sezeroz@gmail.com>

	Merge from trunk rev. 4592:
	Jacek Caban  <jacek@codeweavers.com>
	* _mingw.h.in: Define __STDC_SECURE_LIB__ only if MINGW_HAS_SECURE_API
	is defined.

2011-11-05  Kai Tietz  <ktietz@redhat.com>

	* _mingw.h: Replace always_inline attribute name by __always_inline__.

2011-11-03  Ozkan Sezer  <sezeroz@gmail.com>

	* ntdef.h (FORCEINLINE): Sync the definition to the winnt.h version.

2011-10-04  Ozkan Sezer  <sezeroz@gmail.com>

	Merge from trunk rev. 4319:
	2011-08-07  Ozkan Sezer  <sezeroz@gmail.com>
	* psdk_inc/_socket_types.h: Provide the SOCKET type as unsigned

2011-09-26  Ozkan Sezer  <sezeroz@gmail.com>

	* sdkddkver.h: Whitespace tidy-up.  Add our standart license header.
	(_WIN32_WINNT): Define default value as _WIN32_WINNT_WS03, i.e. 0x0502,
	which is what we had been defining in windows.h until this day.
	(NTDDI_VERSION): Define default value as NTDDI_WS03, i.e. 0x05020000,
	matching what we had been defining in windows.h until this day.
	(WINVER): Define default value as 0x0502, which is what we had been
	defining in windows.h until this day.
	* winnt.h: Include sdkddkver.h.
	* windows.h: Include sdkddkver.h.
	(WINVER): Now that we include sdkddkver.h, remove the extra definition.

2011-09-21  Ozkan Sezer  <sezeroz@gmail.com>

	* _timeval.h (timercmp): Added missing parens around the AND
	condition.

2011-09-12  Ozkan Sezer  <sezeroz@gmail.com>

	Merge from trunk rev. 4407:
	2011-08-22  Jonathan Yong  <jon_y@users.sourceforge.net>
	* _mingw.h.in (__forceinline): Fix for C99 case and check for C++ mode.
	* winnt.h (FORCEINLINE): Simplify based on _mingw.h definition.

2011-08-07  Ozkan Sezer  <sezeroz@gmail.com>

	* wincrypt.h: Added MS_ENH_RSA_AES_PROV_XP[_A|_W]. (Thanks to Alon
	Bar-Lev.)

2011-07-23  Ozkan Sezer  <sezeroz@gmail.com>

	Merged from trunk:
	2010-07-19  Kai Tietz  <kai.tietz@onevision.com> (rev. 4283)
	* _mingw_mac.h (__MINGW_IMP_LSYMBOL): New helper macro for assembly
	files.

2011-07-23  Ozkan Sezer  <sezeroz@gmail.com>

	* winnt.h (C_ASSERT): Revert the EXTERN_C change from rev.4285/4286.
	* usbioctl.h: Remove the extern "C" {} from the header completely.
	There are no functions or variables are declared, only data types,
	therefore it is not needed.
	* dbghelp.h, imagehlp.h: move the extern "C" braces so that the
	C_ASSERTs are not contained within them. (bug #3373905.)
	* crtdbg.h, malloc.h (_STATIC_ASSERT): Restrict the typedef variant
	of the macro to MSVC. Add an extern declaration variant for gcc,
	similar to C_ASSERT.

2011-07-23  Ozkan Sezer  <sezeroz@gmail.com>

	* _mingw.h (__debugbreak): Add prototype before the inline as it
	appears in intrin.h.
	* winnt.h: Move the intrin.h include before the __faststorefence
	inline. Remove the redundant prototype for _m_prefetchw() which
	is already in intrin.h.

2011-07-21  Ozkan Sezer  <sezeroz@gmail.com>

	* winnt.h (C_ASSERT): Define using EXTERN_C instead of extern.
	* ws2tcpip.h: Move the extern "C" closing brace to cover the IN6_
	prototypes.

2011-07-01  Ozkan Sezer  <sezeroz@gmail.com>

	Merged from trunk:
	2011-07-01  Jacek Caban  <jacek@codeweavers.com>  (rev. 4235)
	* winnt.h (FORCEINLINE): Define without extern for __cplusplus.
	2011-07-01  Ozkan Sezer  <sezeroz@gmail.com>  (rev. 4238)
	* ntdef.h (FORCEINLINE): Mirror the __GNUG__ case of FORCEINLINE
	definition in ntdef.h.

2011-06-23  Kai Tietz  <ktietz@redhat.com>

	* basetyps.h (DECLARE_INTERFACE_IID_): New macro.
	* objbase.h: Likewise.

2011-06-15  Jonathan Yong  <jon_y@users.sourceforge.net>

	* wincon.h(ENABLE_INSERT_MODE): Define.
	(ENABLE_QUICK_EDIT_MODE): Define.
	(ENABLE_EXTENDED_FLAGS): Define.
	(ENABLE_AUTO_POSITION): Define.

2011-05-23  Ozkan Sezer  <sezeroz@gmail.com>

	* ctype.h (__mb_cur_max):  Define as __mb_cur_max for the _MSVCRT_
	special case.
	* stdlib.h: Remove the duplicated and typographically erroneous
	__mbcur_max macros. Make the entries identical to the ctype.h
	counterparts.
	(__mb_cur_max): Define as __mb_cur_max for the _MSVCRT_ special case.

2011-05-05  Ozkan Sezer  <sezeroz@gmail.com>

	Merged from trunk:
	2010-02-01  Kai Tietz  <kai.tietz@onevision.com> (rev. 1825)
	Donated by S. Koehler
	* winusbio.h: New API.
	* winusb.h: New API.

2011-05-05  Ozkan Sezer  <sezeroz@gmail.com>

	Merged from trunk:
	2011-05-05  Jonathan Yong  <jon_y@users.sourceforge.net> (rev. 4162)
	* stdlib.h (swab): Use define guards.
	* unistd.h (swab): Copy from stdlib.h as per POSIX spec.

2011-04-27  Jose Fonseca  <jrfonseca@users.sourceforge.net>

	* wingdi.h (WINGDIAPI): When _GDI32_ is defined, define as nothing.

2011-04-21  Ozkan Sezer  <sezeroz@gmail.com>

	Merged from trunk:
	2011-04-21  Jacek Caban  <jacek@codeweavers.com>  (rev. 4146)
	* _mingw.h: Added __MINGW_INTRIN_INLINE as a new macro. Added
	__debugbreak implementation.
	* winnt.h: Added __faststorefence implementation.

2011-04-16  Ozkan Sezer  <sezeroz@gmail.com>

	Merged from trunk:
	2011-04-16  Jacek Caban  <jacek@codeweavers.com>  (revs. 4141-4143)
	* _mingw.h: Added __w64 define.
	* assert.h: Moved extern "C" to the right place.
	* dvec.h, fvec.h, ivec.h: Make them usable.

2011-04-08  Ozkan Sezer  <sezeroz@gmail.com>

	* ksmedia.h:  Guard the SPEAKER_* macros by _SPEAKER_POSITIONS_
	like in mmreg.h.

2011-03-02  Ozkan Sezer  <sezeroz@gmail.com>

	* winuser.h (TOUCHEVENTF_MOVE): Fix value as 0x01 acc.to msdn.
	(TOUCHEVENTF_DOWN): Fix value as 0x02 acc.to msdn.

2011-02-02  Ozkan Sezer  <sezeroz@gmail.com>

	Merged from trunk:
	2011-01-31  Kai Tietz  <kai.tietz@onevision.com>  (rev. 4007)
	* sys/types.h: Make sure pid_t isn't overriden by some clever
	configury.

2011-01-23  Ozkan Sezer  <sezeroz@gmail.com>

	* dos.h (_A_VOLID): Add missing definition, from r/os svn r50165.

2011-01-14  Ozkan Sezer  <sezeroz@gmail.com>

	* winsplp.h (MONITOR2): Fixes according to msdn documentation at
	http://msdn.microsoft.com/en-us/library/ff557532(VS.85).aspx
	thanks to a reminder from Lorenzo Monti. Closes patch tracker ID
	3157986.