[CMAKE]

- Sync with trunk 50501
- fix a couple of merge artifacts (indentation)

svn path=/branches/cmake-bringup/; revision=50505

lib/3rdparty/libsamplerate/CMakeLists.txt

@@ -1,8 +1,4 @@
 
-add_definitions(
-    -DHAVE_LRINT
-    -DHAVE_LRINTF)
-
 list(APPEND SOURCE
     samplerate.c
     src_linear.c

lib/sdk/crt/CMakeLists.txt

@@ -442,10 +442,12 @@ add_pch(crt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${CRT_SOURCE})
 add_dependencies(crt psdk buildno_header asm)
 
 list(APPEND LIBCNTPR_SOURCE
+    float/isnan.c
     math/abs.c
     math/div.c
     math/labs.c
     math/rand_nt.c
+    mbstring/mbstrlen.c
     mem/memccpy.c
     mem/memcmp.c
     mem/memicmp.c
@@ -526,6 +528,7 @@ if(ARCH MATCHES i386)
         math/i386/ftol_asm.s
         math/i386/ftol2_asm.s
         math/i386/log_asm.s
+        math/i386/log10_asm.s
         math/i386/pow_asm.s
         math/i386/sin_asm.s
         math/i386/sqrt_asm.s
@@ -634,4 +637,4 @@ add_library(user32_wsprintf
     printf/wvsnprintfA.c
     printf/wvsnprintfW.c
     string/mbstowcs_nt.c
-    string/wcstombs_nt.c)
+    string/wcstombs_nt.c)

lib/sdk/crt/misc/i10output.c

@@ -42,7 +42,7 @@ int CDECL MSVCRT_I10_OUTPUT(long double ld, int prec, int flag, struct _I10_OUTP
     } else
         data->sign = ' ';
 
-    if(isinf(d)) {
+    if(!_finite(d)) {
         data->pos = 1;
         data->len = 5;
         memcpy(data->str, inf_str, sizeof(inf_str));
@@ -50,7 +50,7 @@ int CDECL MSVCRT_I10_OUTPUT(long double ld, int prec, int flag, struct _I10_OUTP
         return 0;
     }
 
-    if(isnan(d)) {
+    if(_isnan(d)) {
         data->pos = 1;
         data->len = 6;
         memcpy(data->str, nan_str, sizeof(nan_str));

lib/sdk/crt/printf/streamout.c

@@ -217,7 +217,7 @@ format_float(
     }
 
     if (precision > 0 || flags & FLAG_SPECIAL)
-    *--(*string) = _T('.');
+        *--(*string) = _T('.');
 
     /* Digits before the decimal point */
     do
@@ -422,7 +422,7 @@ streamout(FILE *stream, const TCHAR *format, va_list argptr)
                 /* Check if this is the 2nd 'l' in a row */
                 if (format[-2] == 'l') flags |= FLAG_INT64;
                 else flags |= FLAG_LONG;
-                }
+            }
             else if (chr == _T('I'))
             {
                 if (format[0] == _T('3') && format[1] == _T('2'))