Author: tkreuzer Date: Thu Jun 3 14:47:40 2010 New Revision: 47533
URL: http://svn.reactos.org/svn/reactos?rev=47533&view=rev Log: Merge 46523 from amd64 branch:
- Fix assert macro - Add crt="MSVC" to a number of modules to resolve _assert
Modified: trunk/reactos/ (props changed) trunk/reactos/dll/directx/qedit/qedit.rbuild trunk/reactos/dll/directx/quartz/quartz.rbuild trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild trunk/reactos/dll/win32/avifil32/avifil32.rbuild trunk/reactos/dll/win32/comctl32/comctl32.rbuild trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild trunk/reactos/dll/win32/imaadp32.acm/imaadp32.acm.rbuild trunk/reactos/dll/win32/inetmib1/inetmib1.rbuild trunk/reactos/dll/win32/mciwave/mciwave.rbuild trunk/reactos/dll/win32/msacm32/msacm32.rbuild trunk/reactos/dll/win32/msadp32.acm/msadp32.acm.rbuild trunk/reactos/dll/win32/msg711.acm/msg711.acm.rbuild trunk/reactos/dll/win32/msrle32/msrle32.rbuild trunk/reactos/dll/win32/odbccp32/odbccp32.rbuild trunk/reactos/dll/win32/ole32/ole32.rbuild trunk/reactos/dll/win32/riched20/riched20.rbuild trunk/reactos/dll/win32/winemp3.acm/winemp3.acm.rbuild trunk/reactos/dll/win32/wintrust/wintrust.rbuild trunk/reactos/include/crt/assert.h
Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jun 3 14:47:40 2010 @@ -1,3 +1,4 @@ /branches/header-work:45691-46463 +/branches/reactos-yarotows:46966 /branches/ros-amd64-bringup:36852 -/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46478,46511,46524,46526,46534-46535,46537-46539,46589 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589
Modified: trunk/reactos/dll/directx/qedit/qedit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/qedit.rbu... ============================================================================== --- trunk/reactos/dll/directx/qedit/qedit.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/qedit/qedit.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,4 +1,4 @@ -<module name="qedit" type="win32dll" baseaddress="${BASEADDRESS_QEDIT}" installbase="system32" installname="qedit.dll" allowwarnings="true"> +<module name="qedit" type="win32dll" baseaddress="${BASEADDRESS_QEDIT}" installbase="system32" installname="qedit.dll" allowwarnings="true" crt="MSVCRT"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="qedit.spec" /> <include base="qedit">.</include>
Modified: trunk/reactos/dll/directx/quartz/quartz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/quartz.r... ============================================================================== --- trunk/reactos/dll/directx/quartz/quartz.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/quartz/quartz.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="quartz" type="win32dll" baseaddress="${BASEADDRESS_QUARTZ}" installbase="system32" installname="quartz.dll" allowwarnings="true"> +<module name="quartz" type="win32dll" baseaddress="${BASEADDRESS_QUARTZ}" installbase="system32" installname="quartz.dll" allowwarnings="true" crt="MSVCRT"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="quartz.spec" /> <include base="quartz">.</include>
Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddra... ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" allowwarnings ="true"> +<module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" allowwarnings ="true" crt="msvcrt"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="ddraw.spec" /> <include base="ddraw">.</include>
Modified: trunk/reactos/dll/win32/avifil32/avifil32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifil32... ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifil32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifil32.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="avifil32" type="win32dll" baseaddress="${BASEADDRESS_AVIFIL32}" installbase="system32" installname="avifil32.dll" allowwarnings="true"> +<module name="avifil32" type="win32dll" baseaddress="${BASEADDRESS_AVIFIL32}" installbase="system32" installname="avifil32.dll" allowwarnings="true" crt="msvcrt"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="avifil32.spec" /> <include base="avifil32">.</include>
Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl32... ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" unicode="yes" allowwarnings="true"> +<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" unicode="yes" allowwarnings="true" crt="msvcrt"> <autoregister infsection="OleControlDlls" type="DllInstall" /> <importlibrary definition="comctl32.spec" /> <include base="comctl32">.</include>
Modified: trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/comdlg32... ============================================================================== --- trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" allowwarnings="true"> +<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" allowwarnings="true" crt="msvcrt"> <importlibrary definition="comdlg32.spec" /> <include base="comdlg32">.</include> <include base="ReactOS">include/reactos/wine</include>
Modified: trunk/reactos/dll/win32/imaadp32.acm/imaadp32.acm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imaadp32.acm/imaa... ============================================================================== --- trunk/reactos/dll/win32/imaadp32.acm/imaadp32.acm.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imaadp32.acm/imaadp32.acm.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,4 +1,4 @@ -<module name="imaadp32.acm" type="win32dll" baseaddress="${BASEADDRESS_IMAADP32ACM}" installbase="system32" installname="imaadp32.acm" allowwarnings="true" entrypoint="0"> +<module name="imaadp32.acm" type="win32dll" baseaddress="${BASEADDRESS_IMAADP32ACM}" installbase="system32" installname="imaadp32.acm" allowwarnings="true" entrypoint="0" crt="msvcrt"> <importlibrary definition="imaadp32.acm.spec" /> <include base="imaadp32.acm">.</include> <include base="ReactOS">include/reactos/wine</include>
Modified: trunk/reactos/dll/win32/inetmib1/inetmib1.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetmib1/inetmib1... ============================================================================== --- trunk/reactos/dll/win32/inetmib1/inetmib1.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetmib1/inetmib1.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="inetmib1" type="win32dll" baseaddress="${BASEADDRESS_INETMIB1}" installbase="system32" installname="inetmib1.dll" allowwarnings="true"> +<module name="inetmib1" type="win32dll" baseaddress="${BASEADDRESS_INETMIB1}" installbase="system32" installname="inetmib1.dll" allowwarnings="true" crt="msvcrt"> <importlibrary definition="inetmib1.spec" /> <include base="inetmib1">.</include> <include base="ReactOS">include/reactos/wine</include>
Modified: trunk/reactos/dll/win32/mciwave/mciwave.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciwave/mciwave.r... ============================================================================== --- trunk/reactos/dll/win32/mciwave/mciwave.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciwave/mciwave.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,4 +1,4 @@ -<module name="mciwave" type="win32dll" baseaddress="${BASEADDRESS_MCIWAVE}" installbase="system32" installname="mciwave.dll" allowwarnings="true" entrypoint="0"> +<module name="mciwave" type="win32dll" baseaddress="${BASEADDRESS_MCIWAVE}" installbase="system32" installname="mciwave.dll" allowwarnings="true" entrypoint="0" crt="msvcrt"> <importlibrary definition="mciwave.spec" /> <include base="mciwave">.</include> <include base="ReactOS">include/reactos/wine</include>
Modified: trunk/reactos/dll/win32/msacm32/msacm32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm32.r... ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm32.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -<module name="msacm32" type="win32dll" baseaddress="${BASEADDRESS_MSACM32}" installbase="system32" installname="msacm32.dll" unicode="yes"> +<module name="msacm32" type="win32dll" baseaddress="${BASEADDRESS_MSACM32}" installbase="system32" installname="msacm32.dll" unicode="yes" crt="msvcrt"> <importlibrary definition="msacm32.spec" /> <include base="msacm32">.</include> <include base="ReactOS">include/reactos/wine</include>
Modified: trunk/reactos/dll/win32/msadp32.acm/msadp32.acm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msadp32.acm/msadp... ============================================================================== --- trunk/reactos/dll/win32/msadp32.acm/msadp32.acm.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msadp32.acm/msadp32.acm.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,4 +1,4 @@ -<module name="msadp32.acm" type="win32dll" baseaddress="${BASEADDRESS_MSADP32ACM}" installbase="system32" installname="msadp32.acm" allowwarnings="true" entrypoint="0"> +<module name="msadp32.acm" type="win32dll" baseaddress="${BASEADDRESS_MSADP32ACM}" installbase="system32" installname="msadp32.acm" allowwarnings="true" entrypoint="0" crt="msvcrt"> <importlibrary definition="msadp32.acm.spec" /> <include base="msadp32.acm">.</include> <include base="ReactOS">include/reactos/wine</include>
Modified: trunk/reactos/dll/win32/msg711.acm/msg711.acm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msg711.acm/msg711... ============================================================================== --- trunk/reactos/dll/win32/msg711.acm/msg711.acm.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msg711.acm/msg711.acm.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,4 +1,4 @@ -<module name="msg711.acm" type="win32dll" baseaddress="${BASEADDRESS_MSG711ACM}" installbase="system32" installname="msg711.acm" allowwarnings="true" entrypoint="0"> +<module name="msg711.acm" type="win32dll" baseaddress="${BASEADDRESS_MSG711ACM}" installbase="system32" installname="msg711.acm" allowwarnings="true" entrypoint="0" crt="msvcrt"> <importlibrary definition="msg711.acm.spec" /> <include base="msg711.acm">.</include> <include base="ReactOS">include/reactos/wine</include>
Modified: trunk/reactos/dll/win32/msrle32/msrle32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle32.r... ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle32.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,4 +1,4 @@ -<module name="msrle32" type="win32dll" baseaddress="${BASEADDRESS_MSRLE32}" installbase="system32" installname="msrle32.dll" allowwarnings="true"> +<module name="msrle32" type="win32dll" baseaddress="${BASEADDRESS_MSRLE32}" installbase="system32" installname="msrle32.dll" allowwarnings="true" crt="msvcrt"> <importlibrary definition="msrle32.spec" /> <include base="msrle32">.</include> <include base="ReactOS">include/reactos/wine</include>
Modified: trunk/reactos/dll/win32/odbccp32/odbccp32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbccp32/odbccp32... ============================================================================== --- trunk/reactos/dll/win32/odbccp32/odbccp32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/odbccp32/odbccp32.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="odbccp32" type="win32dll" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.dll" allowwarnings="true" entrypoint="0"> +<module name="odbccp32" type="win32dll" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.dll" allowwarnings="true" entrypoint="0" crt="MSVCRT"> <importlibrary definition="odbccp32.spec" /> <include base="odbccp32">.</include> <include base="ReactOS">include/reactos/wine</include>
Modified: trunk/reactos/dll/win32/ole32/ole32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.rbuil... ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole32.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}" installbase="system32" installname="ole32.dll" allowwarnings="true"> +<module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}" installbase="system32" installname="ole32.dll" allowwarnings="true" crt="MSVCRT"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="ole32.spec" /> <include base="ole32">.</include>
Modified: trunk/reactos/dll/win32/riched20/riched20.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/riched20... ============================================================================== --- trunk/reactos/dll/win32/riched20/riched20.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/riched20.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="riched20" type="win32dll" baseaddress="${BASEADDRESS_RICHED20}" installbase="system32" installname="riched20.dll" allowwarnings="true"> +<module name="riched20" type="win32dll" baseaddress="${BASEADDRESS_RICHED20}" installbase="system32" installname="riched20.dll" allowwarnings="true" crt="MSVCRT"> <importlibrary definition="riched20.spec" /> <include base="riched20">.</include> <include base="ReactOS">include/reactos/wine</include>
Modified: trunk/reactos/dll/win32/winemp3.acm/winemp3.acm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/winem... ============================================================================== --- trunk/reactos/dll/win32/winemp3.acm/winemp3.acm.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winemp3.acm/winemp3.acm.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,4 +1,4 @@ -<module name="winemp3.acm" type="win32dll" installbase="system32" installname="winemp3.acm" allowwarnings="true" entrypoint="0"> +<module name="winemp3.acm" type="win32dll" installbase="system32" installname="winemp3.acm" allowwarnings="true" entrypoint="0" crt="MSVCRT"> <importlibrary definition="winemp3.acm.spec" /> <include base="winemp3.acm">.</include> <include base="ReactOS">include/reactos/wine</include>
Modified: trunk/reactos/dll/win32/wintrust/wintrust.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrust... ============================================================================== --- trunk/reactos/dll/win32/wintrust/wintrust.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/wintrust.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,4 +1,4 @@ -<module name="wintrust" type="win32dll" baseaddress="${BASEADDRESS_WINTRUST}" installbase="system32" installname="wintrust.dll" allowwarnings="true"> +<module name="wintrust" type="win32dll" baseaddress="${BASEADDRESS_WINTRUST}" installbase="system32" installname="wintrust.dll" allowwarnings="true" crt="MSVCRT"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="wintrust.spec" /> <include base="wintrust">.</include>
Modified: trunk/reactos/include/crt/assert.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/assert.h?rev=47... ============================================================================== --- trunk/reactos/include/crt/assert.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/assert.h [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -28,8 +28,7 @@ #endif
#ifndef assert -//#define assert(_Expression) (void)((!!(_Expression)) || (_assert(#_Expression,__FILE__,__LINE__),0)) -#define assert(_Expression) (void)((!!(_Expression)))// || (_wassert(_CRT_WIDE(#_Expression),_CRT_WIDE(__FILE__),__LINE__),0)) +#define assert(_Expression) (void)((!!(_Expression)) || (_assert(#_Expression,__FILE__,__LINE__),0)) #endif
#ifndef wassert