Fix gcc's own expectation that _mingw.h doesn't define UNICODE.
Some of gcc's internal compilation (e.g. gcc/ada/mingw32.h) includes
the internal _mingw.h to determine Unicode compatibility via version
numbering checks. However, because this file is included before
UNICODE is defined, later inclusions do not get used if UNICODE has
changed. Therefore, we need to move the definition of these Unicode
definitions into a separate header that is included by anything that
eventually includes _ming_mac.h via _mingw.h.
mingw-w64-headers/crt/ChangeLog:
2010-06-18 Doug Semler <dougsemler@gmail.com>
* _mingw_mac.h: Move Unicode macro definitions to _mingw_unicode.h
* _mingw_unicode.h: New file.
mingw-w64-headers/include/ChangeLog:
2010-06-18 Doug Semler <dougsemler@gmail.com>
* accctrl.h: Include new _mingw_unicode.h for Unicode macros.
* aclapi.h: Likewise.
* cfgmgr32.h: Likewise.
* commctrl.h: Likewise.
* commdlg.h: Likewise.
* cpl.h: Likewise.
* cryptuiapi.h: Likewise.
* custcntl.h: Likewise.
* dbt.h: Likewise.
* ddeml.h: Likewise.
* digitalv.h: Likewise.
* dsclient.h: Likewise.
* dsgetdc.h: Likewise.
* dtchelp.h: Likewise.
* errorrep.h: Likewise.
* htmlhelp.h: Likewise.
* icm.h: Likewise.
* imagehlp.h: Likewise.
* ime.h: Likewise.
* imm.h: Likewise.
* intshcut.h: Likewise.
* isguids.h: Likewise.
* loadperf.h: Likewise.
* lzexpand.h: Likewise.
* mlang.h: Likewise.
* mmsystem.h: Likewise.
* mobsync.h: Likewise.
* msi.h: Likewise.
* msiquery.h: Likewise.
* multimon.h: Likewise.
* newapis.h: Likewise.
* npapi.h: Likewise.
* nspapi.h: Likewise.
* ntdsapi.h: Likewise.
* ntdsbcli.h: Likewise.
* ntmsapi.h: Likewise.
* ntquery.h: Likewise.
* odbcss.h: Likewise.
* oleacc.h: Likewise.
* oledlg.h: Likewise.
* patchapi.h: Likewise.
* patchwiz.h: Likewise.
* pdh.h: Likewise.
* pgobootrun.h: Likewise.
* profinfo.h: Likewise.
* prsht.h: Likewise.
* psapi.h: Likewise.
* ras.h: Likewise.
* rasdlg.h: Likewise.
* richedit.h: Likewise.
* rpcasync.h: Likewise.
* rpcdce.h: Likewise.
* rpcdcep.h: Likewise.
* rpcnsi.h: Likewise.
* rpcssl.h: Likewise.
* rtutils.h: Likewise.
* schannel.h: Likewise.
* sddl.h: Likewise.
* secext.h: Likewise.
* security.h: Likewise.
* sensapi.h: Likewise.
* setupapi.h: Likewise.
* shellapi.h: Likewise.
* shfolder.h: Likewise.
* shlguid.h: Likewise.
* shlobj.h: Likewise.
* shlwapi.h: Likewise.
* shobjidl.h: Likewise.
* smx.h: Likewise.
* srrestoreptapi.h: Likewise.
* sspi.h: Likewise.
* strsafe.h: Likewise.
* tapi.h: Likewise.
* traffic.h: Likewise.
* uastrfnc.h: Likewise.
* umx.h: Likewise.
* urlmon.h: Likewise.
* userenv.h: Likewise.
* vfw.h: Likewise.
* wfext.h: Likewise.
* winbase.h: Likewise.
* wincon.h: Likewise.
* wincred.h: Likewise.
* wincrypt.h: Likewise.
* windns.h: Likewise.
* wingdi.h: Likewise.
* wininet.h: Likewise.
* winnetwk.h: Likewise.
* winnls.h: Likewise.
* winnls32.h: Likewise.
* winnt.h: Likewise.
* winreg.h: Likewise.
* winscard.h: Likewise.
* winsmcrd.h: Likewise.
* winsock2.h: Likewise.
* winspool.h: Likewise.
* winsvc.h: Likewise.
* winuser.h: Likewise.
* winver.h: Likewise.
* wpapi.h: Likewise.
* wptypes.h: Likewise.
* ws2tcpip.h: Likewise.
* wtsapi32.h: Likewise.
* xolehlp.h: Likewise.
* zmouse.h: Likewise.
git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@2573 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/include/patchwiz.h b/mingw-w64-headers/include/patchwiz.h
index 63e10bc..480ab75 100644
--- a/mingw-w64-headers/include/patchwiz.h
+++ b/mingw-w64-headers/include/patchwiz.h
@@ -3,6 +3,9 @@
* This file is part of the w64 mingw-runtime package.
* No warranty is given; refer to the file DISCLAIMER.PD within this package.
*/
+
+#include <_mingw_unicode.h>
+
#define ERROR_PCW_BASE 0xC00E5101
#define ERROR_PCW_PCP_DOESNT_EXIST (ERROR_PCW_BASE + 0x00)
