Merge to XFA: Reland "Cleanup some numeric code.""

core/src/fxcrt/fx_extension.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/include/fxcrt/fx_basic.h"
 #include "core/include/fxcrt/fx_ext.h"
 #include "extension.h"
 
@@ skipping 45 matching lines @@
   return FX_CreateFileStream(filename, FX_FILEMODE_ReadOnly);
 }
 IFX_MemoryStream* FX_CreateMemoryStream(uint8_t* pBuffer,
                                         size_t dwSize,
                                         FX_BOOL bTakeOver) {
   return new CFX_MemoryStream(pBuffer, dwSize, bTakeOver);
 }
 IFX_MemoryStream* FX_CreateMemoryStream(FX_BOOL bConsecutive) {
   return new CFX_MemoryStream(bConsecutive);
 }
-#ifdef __cplusplus
-extern "C" {
-#endif
+
 FX_FLOAT FXSYS_tan(FX_FLOAT a) {
   return (FX_FLOAT)tan(a);
 }
 FX_FLOAT FXSYS_logb(FX_FLOAT b, FX_FLOAT x) {
   return FXSYS_log(x) / FXSYS_log(b);
 }
 FX_FLOAT FXSYS_strtof(const FX_CHAR* pcsStr,
                       int32_t iLength,
                       int32_t* pUsedLen) {
   FXSYS_assert(pcsStr != NULL);
@@ skipping 116 matching lines @@
     while (pStr < pStrEnd) {
       dwHashCode = 1313 * dwHashCode + FXSYS_tolower(*pStr++);
     }
   } else {
     while (pStr < pStrEnd) {
       dwHashCode = 1313 * dwHashCode + *pStr++;
     }
   }
   return dwHashCode;
 }
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
+
 void* FX_Random_MT_Start(FX_DWORD dwSeed) {
   FX_LPMTRANDOMCONTEXT pContext = FX_Alloc(FX_MTRANDOMCONTEXT, 1);
   pContext->mt[0] = dwSeed;
   FX_DWORD& i = pContext->mti;
   FX_DWORD* pBuf = pContext->mt;
   for (i = 1; i < MT_N; i++) {
     pBuf[i] = (1812433253UL * (pBuf[i - 1] ^ (pBuf[i - 1] >> 30)) + i);
   }
   pContext->bHaveSeed = TRUE;
   return pContext;
@@ skipping 82 matching lines @@
   return TRUE;
 }
 #endif
 void FX_Random_GenerateCrypto(FX_DWORD* pBuffer, int32_t iCount) {
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
   FX_GenerateCryptoRandom(pBuffer, iCount);
 #else
   FX_Random_GenerateBase(pBuffer, iCount);
 #endif
 }
-#ifdef __cplusplus

[dsinclair, 2015/11/16 17:44:48]

Merge conflict.

-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
+
 void FX_GUID_CreateV4(FX_LPGUID pGUID) {
 #if (_FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN32_MOBILE_ || \
      _FX_OS_ == _FX_WIN64_)
 #ifdef _FX_WINAPI_PARTITION_DESKTOP_
   if (!FX_GenerateCryptoRandom((FX_DWORD*)pGUID, 4)) {
     FX_Random_GenerateMT((FX_DWORD*)pGUID, 4);
   }
 #else
   FX_Random_GenerateMT((FX_DWORD*)pGUID, 4);
 #endif
@@ skipping 12 matching lines @@
   for (int32_t i = 0; i < 16; i++) {
     b = ((const uint8_t*)pGUID)[i];
     *pBuf++ = gs_FX_pHexChars[b >> 4];
     *pBuf++ = gs_FX_pHexChars[b & 0x0F];
     if (bSeparator && (i == 3 || i == 5 || i == 7 || i == 9)) {
       *pBuf++ = L'-';
     }
   }
   bsStr.ReleaseBuffer(bSeparator ? 36 : 32);
 }
-#ifdef __cplusplus

[dsinclair, 2015/11/16 17:44:49]

Merge conflict.

-}
-#endif