[tkreuzer] 46597: Merge from amd64 branch: 46478 [CRT] - define _CRTBLD - rename float_t/double_t/long_double_t to float_s/double_s/long_double_s to avoid name conflicts 46511 [FREELDR] snprintf -> _snprintf 46534 [CRT] - Set crt="static" in freeldr, rtl, bmfs, ftfd, rtl, mini_hal - define "CRTDLL" in ntdll, crtdll, msvcrt, msvcrt20, msvcrt40 46535 [CRT HEADERS] - add _mingw_mac.h from ming-w64 and include it into _mingw.h - Update _CRTIMP definition - Fix definition of _wctype - onexit is not _

Author: tkreuzer
Date: Tue Mar 30 15:30:36 2010
New Revision: 46597

URL: http://svn.reactos.org/svn/reactos?rev=46597&view=rev
Log:
Merge from amd64 branch:

46478
[CRT]
- define _CRTBLD
- rename float_t/double_t/long_double_t to float_s/double_s/long_double_s to avoid name conflicts

46511
[FREELDR]
snprintf -> _snprintf

46534
[CRT]
- Set crt="static" in freeldr, rtl, bmfs, ftfd, rtl, mini_hal
- define "CRTDLL" in ntdll, crtdll, msvcrt, msvcrt20, msvcrt40

46535
[CRT HEADERS]
- add _mingw_mac.h from ming-w64 and include it into _mingw.h
- Update _CRTIMP definition
- Fix definition of _wctype
- onexit is not _CRTIMP

46537
[MINGW]
Update mingw library to mingw-w64 trunk (mingw-w64-src_20100325)

46538
Apply MSVC compilation fix.

46539
[MINGW]
Apply MSVC compilation fixes

Added:
    trunk/reactos/include/crt/_mingw_mac.h
      - copied unchanged from r46535, branches/ros-amd64-bringup/reactos/include/crt/_mingw_mac.h
    trunk/reactos/include/reactos/mingw-w64/reactos.diff   (with props)
    trunk/reactos/lib/3rdparty/mingw/CRT_glob.c   (with props)
    trunk/reactos/lib/3rdparty/mingw/CRT_noglob.c
      - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_noglob.c
    trunk/reactos/lib/3rdparty/mingw/binmode.c   (with props)
    trunk/reactos/lib/3rdparty/mingw/crt_handler.c   (with props)
    trunk/reactos/lib/3rdparty/mingw/crtbegin.c
      - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtbegin.c
    trunk/reactos/lib/3rdparty/mingw/crtend.c
      - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtend.c
    trunk/reactos/lib/3rdparty/mingw/dll_argv.c   (with props)
    trunk/reactos/lib/3rdparty/mingw/isascii.c
      - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/isascii.c
    trunk/reactos/lib/3rdparty/mingw/iscsym.c
      - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/iscsym.c
    trunk/reactos/lib/3rdparty/mingw/iscsymf.c
      - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/iscsymf.c
    trunk/reactos/lib/3rdparty/mingw/mingw_custom.c   (with props)
    trunk/reactos/lib/3rdparty/mingw/reactos.diff   (with props)
    trunk/reactos/lib/3rdparty/mingw/strcasecmp.c
      - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/strcasecmp.c
    trunk/reactos/lib/3rdparty/mingw/strncasecmp.c
      - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/strncasecmp.c
    trunk/reactos/lib/3rdparty/mingw/tlsmcrt.c
      - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlsmcrt.c
    trunk/reactos/lib/3rdparty/mingw/tlsmthread.c
      - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlsmthread.c
    trunk/reactos/lib/3rdparty/mingw/tlsthrd.c
      - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlsthrd.c
    trunk/reactos/lib/3rdparty/mingw/toascii.c
      - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/toascii.c
    trunk/reactos/lib/3rdparty/mingw/txtmode.c   (with props)
    trunk/reactos/lib/3rdparty/mingw/ucrtexe.c
      - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/ucrtexe.c
    trunk/reactos/lib/3rdparty/mingw/udll_argv.c
      - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/udll_argv.c
    trunk/reactos/lib/3rdparty/mingw/udllargc.c
      - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/udllargc.c
    trunk/reactos/lib/3rdparty/mingw/wcscmpi.c
      - copied unchanged from r46537, branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wcscmpi.c
Removed:
    trunk/reactos/lib/3rdparty/mingw/getopt.c
Modified:
    trunk/reactos/   (props changed)
    trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild
    trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild
    trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild
    trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild
    trunk/reactos/boot/freeldr/freeldr/windows/winldr.c
    trunk/reactos/dll/directx/bdaplgin/classfactory.cpp   (props changed)
    trunk/reactos/dll/directx/d3d8/d3d8.spec   (props changed)
    trunk/reactos/dll/directx/dsound_new/classfactory.c   (props changed)
    trunk/reactos/dll/directx/dsound_new/dsound.spec   (props changed)
    trunk/reactos/dll/directx/dsound_new/dsound_convert.c   (props changed)
    trunk/reactos/dll/directx/dsound_new/regsvr.c   (props changed)
    trunk/reactos/dll/ntdll/ntdll.rbuild
    trunk/reactos/dll/shellext/devcpux/devcpux.spec   (props changed)
    trunk/reactos/dll/shellext/slayer/slayer.spec   (props changed)
    trunk/reactos/dll/win32/crtdll/crtdll.rbuild
    trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild
    trunk/reactos/dll/win32/msvcrt20/msvcrt20.rbuild
    trunk/reactos/dll/win32/msvcrt40/msvcrt40.rbuild
    trunk/reactos/hal/halx86/hal_generic.rbuild
    trunk/reactos/include/crt/_mingw.h
    trunk/reactos/include/crt/crtdefs.h
    trunk/reactos/include/crt/stdlib.h
    trunk/reactos/include/ndk/amd64/   (props changed)
    trunk/reactos/include/ndk/amd64/asmmacro.S   (props changed)
    trunk/reactos/include/reactos/mingw-w64/internal.h
    trunk/reactos/include/reactos/mingw-w64/oscalls.h
    trunk/reactos/include/reactos/mingw-w64/sect_attribs.h
    trunk/reactos/lib/3rdparty/mingw/CRT_fp10.c
    trunk/reactos/lib/3rdparty/mingw/CRT_fp8.c
    trunk/reactos/lib/3rdparty/mingw/_newmode.c
    trunk/reactos/lib/3rdparty/mingw/atonexit.c
    trunk/reactos/lib/3rdparty/mingw/charmax.c
    trunk/reactos/lib/3rdparty/mingw/crt0_c.c
    trunk/reactos/lib/3rdparty/mingw/crt0_w.c
    trunk/reactos/lib/3rdparty/mingw/crtdll.c
    trunk/reactos/lib/3rdparty/mingw/crtexe.c
    trunk/reactos/lib/3rdparty/mingw/dllargv.c
    trunk/reactos/lib/3rdparty/mingw/dllentry.c
    trunk/reactos/lib/3rdparty/mingw/dllmain.c
    trunk/reactos/lib/3rdparty/mingw/gccmain.c
    trunk/reactos/lib/3rdparty/mingw/gs_support.c
    trunk/reactos/lib/3rdparty/mingw/merr.c
    trunk/reactos/lib/3rdparty/mingw/mingw.rbuild
    trunk/reactos/lib/3rdparty/mingw/mingw_helpers.c
    trunk/reactos/lib/3rdparty/mingw/natstart.c
    trunk/reactos/lib/3rdparty/mingw/pesect.c
    trunk/reactos/lib/3rdparty/mingw/pseudo-reloc-list.c
    trunk/reactos/lib/3rdparty/mingw/pseudo-reloc.c
    trunk/reactos/lib/3rdparty/mingw/tlssup.c
    trunk/reactos/lib/3rdparty/mingw/wildcard.c
    trunk/reactos/lib/3rdparty/mingw/xncommod.c
    trunk/reactos/lib/3rdparty/mingw/xthdloc.c
    trunk/reactos/lib/3rdparty/mingw/xtxtmode.c
    trunk/reactos/lib/rtl/rtl.rbuild
    trunk/reactos/lib/sdk/crt/crt.rbuild
    trunk/reactos/lib/sdk/crt/except/xcptfil.c
    trunk/reactos/lib/sdk/crt/float/chgsign.c
    trunk/reactos/lib/sdk/crt/float/copysign.c
    trunk/reactos/lib/sdk/crt/float/fpclass.c
    trunk/reactos/lib/sdk/crt/float/isnan.c
    trunk/reactos/lib/sdk/crt/float/scalb.c
    trunk/reactos/lib/sdk/crt/include/internal/ieee.h
    trunk/reactos/lib/sdk/crt/libcntpr.rbuild
    trunk/reactos/lib/sdk/crt/math/frexp.c
    trunk/reactos/lib/sdk/crt/math/huge_val.c
    trunk/reactos/lib/sdk/crt/math/modf.c
    trunk/reactos/lib/sdk/crt/time/   (props changed)
    trunk/reactos/ntoskrnl/kdbg/   (props changed)
    trunk/reactos/subsystems/win32/win32k/include/engobjects.h   (props changed)
    trunk/reactos/tools/rsym/rsym.c   (props changed)
    trunk/reactos/tools/rsym/rsym.h   (props changed)
    trunk/reactos/tools/rsym/rsym.mak   (props changed)
    trunk/reactos/tools/rsym/rsym_common.c   (props changed)

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freeld...

Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freeld...

Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freeld...

Modified: trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setupl...

Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/window...

Modified: trunk/reactos/dll/ntdll/ntdll.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev=...

Modified: trunk/reactos/dll/win32/crtdll/crtdll.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/crtdll.rbu...

Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.rbu...

Modified: trunk/reactos/dll/win32/msvcrt20/msvcrt20.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt20/msvcrt20...

Modified: trunk/reactos/dll/win32/msvcrt40/msvcrt40.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt40/msvcrt40...

Modified: trunk/reactos/hal/halx86/hal_generic.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic.rbui...

Modified: trunk/reactos/include/crt/_mingw.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/_mingw.h?rev=46...

Modified: trunk/reactos/include/crt/crtdefs.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/crtdefs.h?rev=4...

Modified: trunk/reactos/include/crt/stdlib.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdlib.h?rev=46...

Modified: trunk/reactos/include/reactos/mingw-w64/internal.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mingw-w64/i...

Modified: trunk/reactos/include/reactos/mingw-w64/oscalls.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mingw-w64/o...

Added: trunk/reactos/include/reactos/mingw-w64/reactos.diff
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mingw-w64/r...

Modified: trunk/reactos/include/reactos/mingw-w64/sect_attribs.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mingw-w64/s...

Modified: trunk/reactos/lib/3rdparty/mingw/CRT_fp10.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/CRT_fp10...

Modified: trunk/reactos/lib/3rdparty/mingw/CRT_fp8.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/CRT_fp8....

Added: trunk/reactos/lib/3rdparty/mingw/CRT_glob.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/CRT_glob...

Modified: trunk/reactos/lib/3rdparty/mingw/_newmode.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/_newmode...

Modified: trunk/reactos/lib/3rdparty/mingw/atonexit.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/atonexit...

Added: trunk/reactos/lib/3rdparty/mingw/binmode.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/binmode....

Modified: trunk/reactos/lib/3rdparty/mingw/charmax.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/charmax....

Modified: trunk/reactos/lib/3rdparty/mingw/crt0_c.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crt0_c.c...

Modified: trunk/reactos/lib/3rdparty/mingw/crt0_w.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crt0_w.c...

Added: trunk/reactos/lib/3rdparty/mingw/crt_handler.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crt_hand...

Modified: trunk/reactos/lib/3rdparty/mingw/crtdll.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crtdll.c...

Modified: trunk/reactos/lib/3rdparty/mingw/crtexe.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crtexe.c...

Added: trunk/reactos/lib/3rdparty/mingw/dll_argv.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/dll_argv...

Modified: trunk/reactos/lib/3rdparty/mingw/dllargv.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/dllargv....

Modified: trunk/reactos/lib/3rdparty/mingw/dllentry.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/dllentry...

Modified: trunk/reactos/lib/3rdparty/mingw/dllmain.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/dllmain....

Modified: trunk/reactos/lib/3rdparty/mingw/gccmain.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/gccmain....

Removed: trunk/reactos/lib/3rdparty/mingw/getopt.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/getopt.c...

Modified: trunk/reactos/lib/3rdparty/mingw/gs_support.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/gs_suppo...

Modified: trunk/reactos/lib/3rdparty/mingw/merr.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/merr.c?r...

Modified: trunk/reactos/lib/3rdparty/mingw/mingw.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw.rb...

Added: trunk/reactos/lib/3rdparty/mingw/mingw_custom.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw_cu...

Modified: trunk/reactos/lib/3rdparty/mingw/mingw_helpers.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw_he...

Modified: trunk/reactos/lib/3rdparty/mingw/natstart.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/natstart...

Modified: trunk/reactos/lib/3rdparty/mingw/pesect.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/pesect.c...

Modified: trunk/reactos/lib/3rdparty/mingw/pseudo-reloc-list.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/pseudo-r...

Modified: trunk/reactos/lib/3rdparty/mingw/pseudo-reloc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/pseudo-r...

Added: trunk/reactos/lib/3rdparty/mingw/reactos.diff
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/reactos....

Modified: trunk/reactos/lib/3rdparty/mingw/tlssup.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/tlssup.c...

Added: trunk/reactos/lib/3rdparty/mingw/txtmode.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/txtmode....

Modified: trunk/reactos/lib/3rdparty/mingw/wildcard.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/wildcard...

Modified: trunk/reactos/lib/3rdparty/mingw/xncommod.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/xncommod...

Modified: trunk/reactos/lib/3rdparty/mingw/xthdloc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/xthdloc....

Modified: trunk/reactos/lib/3rdparty/mingw/xtxtmode.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/xtxtmode...

Modified: trunk/reactos/lib/rtl/rtl.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=4659...

Modified: trunk/reactos/lib/sdk/crt/crt.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev=...

Modified: trunk/reactos/lib/sdk/crt/except/xcptfil.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/xcptfil....

Modified: trunk/reactos/lib/sdk/crt/float/chgsign.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/chgsign.c...

Modified: trunk/reactos/lib/sdk/crt/float/copysign.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/copysign....

Modified: trunk/reactos/lib/sdk/crt/float/fpclass.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/fpclass.c...

Modified: trunk/reactos/lib/sdk/crt/float/isnan.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/isnan.c?r...

Modified: trunk/reactos/lib/sdk/crt/float/scalb.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/scalb.c?r...

Modified: trunk/reactos/lib/sdk/crt/include/internal/ieee.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/interna...

Modified: trunk/reactos/lib/sdk/crt/libcntpr.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.rbuild...

Modified: trunk/reactos/lib/sdk/crt/math/frexp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/frexp.c?re...

Modified: trunk/reactos/lib/sdk/crt/math/huge_val.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/huge_val.c...

Modified: trunk/reactos/lib/sdk/crt/math/modf.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/modf.c?rev...