Update to opus-HEAD-66611f1.

celt/float_cast.h

 /* Copyright (C) 2001 Erik de Castro Lopo <erikd AT mega-nerd DOT com> */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    are met:
 
    - Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
 
    - Redistributions in binary form must reproduce the above copyright
@@ skipping 72 matching lines @@
 
 #define _ISOC9X_SOURCE 1
 #define _ISOC99_SOURCE 1
 
 #define __USE_ISOC9X 1
 #define __USE_ISOC99 1
 
 #include <math.h>
 #define float2int(x) lrint(x)
 
-#elif (defined(_MSC_VER) && _MSC_VER >= 1400) && (defined (WIN64) || defined (_WIN64))
+#elif (defined(_MSC_VER) && _MSC_VER >= 1400) && defined (_M_X64)
         #include <xmmintrin.h>
 
         __inline long int float2int(float value)
         {
                 return _mm_cvtss_si32(_mm_load_ss(&value));
         }
-#elif (defined(_MSC_VER) && _MSC_VER >= 1400) && (defined (WIN32) || defined (_WIN32))
+#elif (defined(_MSC_VER) && _MSC_VER >= 1400) && defined (_M_IX86)
         #include <math.h>
 
         /*      Win32 doesn't seem to have these functions.
         **      Therefore implement OPUS_INLINE versions of these functions here.
         */
 
         __inline long int
         float2int (float flt)
         {       int intgr;
 
@@ skipping 20 matching lines @@
 static OPUS_INLINE opus_int16 FLOAT2INT16(float x)
 {
    x = x*CELT_SIG_SCALE;
    x = MAX32(x, -32768);
    x = MIN32(x, 32767);
    return (opus_int16)float2int(x);
 }
 #endif /* DISABLE_FLOAT_API */
 
 #endif /* FLOAT_CAST_H */