summaryrefslogtreecommitdiff
path: root/core/fxcrt
diff options
context:
space:
mode:
Diffstat (limited to 'core/fxcrt')
-rw-r--r--core/fxcrt/cfx_datetime.cpp10
-rw-r--r--core/fxcrt/cfx_datetime.h4
-rw-r--r--core/fxcrt/cfx_fileaccess_posix.cpp6
-rw-r--r--core/fxcrt/cfx_fileaccess_posix.h6
-rw-r--r--core/fxcrt/cfx_fileaccess_windows.cpp2
-rw-r--r--core/fxcrt/cfx_fileaccess_windows.h2
-rw-r--r--core/fxcrt/cfx_seekablestreamproxy.cpp2
-rw-r--r--core/fxcrt/fx_random.cpp20
-rw-r--r--core/fxcrt/fx_stream.cpp6
-rw-r--r--core/fxcrt/fx_stream.h8
-rw-r--r--core/fxcrt/fx_system.cpp6
-rw-r--r--core/fxcrt/fx_system.h74
-rw-r--r--core/fxcrt/fx_system_unittest.cpp4
13 files changed, 75 insertions, 75 deletions
diff --git a/core/fxcrt/cfx_datetime.cpp b/core/fxcrt/cfx_datetime.cpp
index beba3654a4..521e07cb67 100644
--- a/core/fxcrt/cfx_datetime.cpp
+++ b/core/fxcrt/cfx_datetime.cpp
@@ -7,8 +7,8 @@
#include "core/fxcrt/cfx_datetime.h"
#include "core/fxcrt/fx_system.h"
-#if _FX_OS_ == _FX_LINUX_DESKTOP_ || _FX_OS_ == _FX_ANDROID_ || \
- _FX_OS_ == _FX_MACOSX_
+#if _FX_OS_ == _FX_OS_LINUX_ || _FX_OS_ == _FX_OS_ANDROID_ || \
+ _FX_OS_ == _FX_OS_MACOSX_
#include <sys/time.h>
#include <time.h>
#endif
@@ -92,9 +92,9 @@ bool FX_IsLeapYear(int32_t iYear) {
void CFX_DateTime::Now() {
FXUT_SYSTEMTIME utLocal;
-#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
+#if _FX_OS_ == _FX_OS_WIN32_ || _FX_OS_ == _FX_OS_WIN64_
::GetLocalTime((LPSYSTEMTIME)&utLocal);
-#else // _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
+#else // _FX_OS_ == _FX_OS_WIN32_ || _FX_OS_ == _FX_OS_WIN64_
timeval curTime;
gettimeofday(&curTime, nullptr);
@@ -108,7 +108,7 @@ void CFX_DateTime::Now() {
utLocal.wMinute = st.tm_min;
utLocal.wSecond = st.tm_sec;
utLocal.wMillisecond = curTime.tv_usec / 1000;
-#endif // _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
+#endif // _FX_OS_ == _FX_OS_WIN32_ || _FX_OS_ == _FX_OS_WIN64_
year_ = utLocal.wYear;
month_ = static_cast<uint8_t>(utLocal.wMonth);
diff --git a/core/fxcrt/cfx_datetime.h b/core/fxcrt/cfx_datetime.h
index 272c2496cc..28991103f5 100644
--- a/core/fxcrt/cfx_datetime.h
+++ b/core/fxcrt/cfx_datetime.h
@@ -91,14 +91,14 @@ class CFX_DateTime {
uint16_t millisecond_;
};
-#if _FX_OS_ != _FX_ANDROID_
+#if _FX_OS_ != _FX_OS_ANDROID_
#pragma pack(push, 1)
#endif
struct FX_TIMEZONE {
int8_t tzHour;
uint8_t tzMinute;
};
-#if _FX_OS_ != _FX_ANDROID_
+#if _FX_OS_ != _FX_OS_ANDROID_
#pragma pack(pop)
#endif
diff --git a/core/fxcrt/cfx_fileaccess_posix.cpp b/core/fxcrt/cfx_fileaccess_posix.cpp
index d98e58dbe9..2f85670c59 100644
--- a/core/fxcrt/cfx_fileaccess_posix.cpp
+++ b/core/fxcrt/cfx_fileaccess_posix.cpp
@@ -18,9 +18,9 @@
#define O_LARGEFILE 0
#endif // O_LARGEFILE
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ || \
- _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ || \
- _FXM_PLATFORM_ == _FXM_PLATFORM_ANDROID_
+#if _FX_PLATFORM_ == _FX_PLATFORM_LINUX_ || \
+ _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ || \
+ _FX_PLATFORM_ == _FX_PLATFORM_ANDROID_
namespace {
diff --git a/core/fxcrt/cfx_fileaccess_posix.h b/core/fxcrt/cfx_fileaccess_posix.h
index 0b739e72d8..efa25ebb4c 100644
--- a/core/fxcrt/cfx_fileaccess_posix.h
+++ b/core/fxcrt/cfx_fileaccess_posix.h
@@ -9,9 +9,9 @@
#include "core/fxcrt/ifx_fileaccess.h"
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ || \
- _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ || \
- _FXM_PLATFORM_ == _FXM_PLATFORM_ANDROID_
+#if _FX_PLATFORM_ == _FX_PLATFORM_LINUX_ || \
+ _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ || \
+ _FX_PLATFORM_ == _FX_PLATFORM_ANDROID_
class CFX_FileAccess_Posix : public IFX_FileAccess {
public:
CFX_FileAccess_Posix();
diff --git a/core/fxcrt/cfx_fileaccess_windows.cpp b/core/fxcrt/cfx_fileaccess_windows.cpp
index 105ad788f7..1ac4496edb 100644
--- a/core/fxcrt/cfx_fileaccess_windows.cpp
+++ b/core/fxcrt/cfx_fileaccess_windows.cpp
@@ -11,7 +11,7 @@
#include "core/fxcrt/fx_string.h"
#include "third_party/base/ptr_util.h"
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
namespace {
diff --git a/core/fxcrt/cfx_fileaccess_windows.h b/core/fxcrt/cfx_fileaccess_windows.h
index f05ab39d6e..6fd07d553c 100644
--- a/core/fxcrt/cfx_fileaccess_windows.h
+++ b/core/fxcrt/cfx_fileaccess_windows.h
@@ -9,7 +9,7 @@
#include "core/fxcrt/ifx_fileaccess.h"
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
class CFX_FileAccess_Windows : public IFX_FileAccess {
public:
CFX_FileAccess_Windows();
diff --git a/core/fxcrt/cfx_seekablestreamproxy.cpp b/core/fxcrt/cfx_seekablestreamproxy.cpp
index 24f7869f45..3c0b5d5aef 100644
--- a/core/fxcrt/cfx_seekablestreamproxy.cpp
+++ b/core/fxcrt/cfx_seekablestreamproxy.cpp
@@ -6,7 +6,7 @@
#include "core/fxcrt/cfx_seekablestreamproxy.h"
-#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
+#if _FX_OS_ == _FX_OS_WIN32_ || _FX_OS_ == _FX_OS_WIN64_
#include <io.h>
#endif
diff --git a/core/fxcrt/fx_random.cpp b/core/fxcrt/fx_random.cpp
index 483a56bbf4..56f84d59b3 100644
--- a/core/fxcrt/fx_random.cpp
+++ b/core/fxcrt/fx_random.cpp
@@ -16,12 +16,12 @@
#define MT_Upper_Mask 0x80000000
#define MT_Lower_Mask 0x7fffffff
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
#include <wincrypt.h>
-#else // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#else // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
#include <sys/time.h>
#include <unistd.h>
-#endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
namespace {
@@ -33,7 +33,7 @@ struct MTContext {
bool g_bHaveGlobalSeed = false;
uint32_t g_nGlobalSeed = 0;
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
bool GenerateSeedFromCryptoRandom(uint32_t* pSeed) {
HCRYPTPROV hCP = 0;
if (!::CryptAcquireContext(&hCP, nullptr, nullptr, PROV_RSA_FULL, 0) ||
@@ -50,30 +50,30 @@ uint32_t GenerateSeedFromEnvironment() {
char c;
uintptr_t p = reinterpret_cast<uintptr_t>(&c);
uint32_t seed = ~static_cast<uint32_t>(p >> 3);
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
SYSTEMTIME st;
GetSystemTime(&st);
seed ^= static_cast<uint32_t>(st.wSecond) * 1000000;
seed ^= static_cast<uint32_t>(st.wMilliseconds) * 1000;
seed ^= GetCurrentProcessId();
-#else // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#else // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
struct timeval tv;
gettimeofday(&tv, 0);
seed ^= static_cast<uint32_t>(tv.tv_sec) * 1000000;
seed ^= static_cast<uint32_t>(tv.tv_usec);
seed ^= static_cast<uint32_t>(getpid());
-#endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
return seed;
}
void* ContextFromNextGlobalSeed() {
if (!g_bHaveGlobalSeed) {
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
if (!GenerateSeedFromCryptoRandom(&g_nGlobalSeed))
g_nGlobalSeed = GenerateSeedFromEnvironment();
-#else // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#else // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
g_nGlobalSeed = GenerateSeedFromEnvironment();
-#endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
g_bHaveGlobalSeed = true;
}
return FX_Random_MT_Start(++g_nGlobalSeed);
diff --git a/core/fxcrt/fx_stream.cpp b/core/fxcrt/fx_stream.cpp
index e15fdb0a81..bd75ad6ec7 100644
--- a/core/fxcrt/fx_stream.cpp
+++ b/core/fxcrt/fx_stream.cpp
@@ -100,7 +100,7 @@ bool IFX_SeekableStream::WriteString(const ByteStringView& str) {
}
FX_FileHandle* FX_OpenFolder(const char* path) {
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
auto pData = pdfium::MakeUnique<CFindFileDataA>();
pData->m_Handle =
FindFirstFileExA((ByteString(path) + "/*.*").c_str(), FindExInfoStandard,
@@ -121,7 +121,7 @@ bool FX_GetNextFile(FX_FileHandle* handle,
if (!handle)
return false;
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
if (handle->m_bEnd)
return false;
@@ -145,7 +145,7 @@ void FX_CloseFolder(FX_FileHandle* handle) {
if (!handle)
return;
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
FindClose(handle->m_Handle);
delete handle;
#else
diff --git a/core/fxcrt/fx_stream.h b/core/fxcrt/fx_stream.h
index d7944167c6..84e33c2060 100644
--- a/core/fxcrt/fx_stream.h
+++ b/core/fxcrt/fx_stream.h
@@ -11,13 +11,13 @@
#include "core/fxcrt/fx_system.h"
#include "core/fxcrt/retain_ptr.h"
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
#include <direct.h>
class CFindFileDataA;
typedef CFindFileDataA FX_FileHandle;
-#else // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#else // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
#include <dirent.h>
#include <fcntl.h>
@@ -26,7 +26,7 @@ typedef CFindFileDataA FX_FileHandle;
#include <unistd.h>
typedef DIR FX_FileHandle;
-#endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
FX_FileHandle* FX_OpenFolder(const char* path);
bool FX_GetNextFile(FX_FileHandle* handle, ByteString* filename, bool* bFolder);
@@ -109,7 +109,7 @@ class IFX_SeekableStream : public IFX_SeekableReadStream,
bool Flush() override = 0;
};
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
class CFindFileData {
public:
virtual ~CFindFileData() {}
diff --git a/core/fxcrt/fx_system.cpp b/core/fxcrt/fx_system.cpp
index bf13ad2e5e..a5ceec5be1 100644
--- a/core/fxcrt/fx_system.cpp
+++ b/core/fxcrt/fx_system.cpp
@@ -106,7 +106,7 @@ const char* FXSYS_i64toa(int64_t value, char* str, int radix) {
return FXSYS_IntToStr<int64_t, uint64_t, char*>(value, str, radix);
}
-#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ != _FX_PLATFORM_WINDOWS_
int FXSYS_GetACP() {
return 0;
@@ -219,7 +219,7 @@ int FXSYS_MultiByteToWideChar(uint32_t codepage,
return wlen;
}
-#else // _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
+#else // _FX_PLATFORM_ != _FX_PLATFORM_WINDOWS_
size_t FXSYS_wcsftime(wchar_t* strDest,
size_t maxsize,
@@ -239,4 +239,4 @@ size_t FXSYS_wcsftime(wchar_t* strDest,
return wcsftime(strDest, maxsize, format, timeptr);
}
-#endif // _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
+#endif // _FX_PLATFORM_ != _FX_PLATFORM_WINDOWS_
diff --git a/core/fxcrt/fx_system.h b/core/fxcrt/fx_system.h
index 7a95bf4fd0..426dc085fc 100644
--- a/core/fxcrt/fx_system.h
+++ b/core/fxcrt/fx_system.h
@@ -18,34 +18,34 @@
#include <wchar.h>
// _FX_OS_ values:
-#define _FX_WIN32_DESKTOP_ 1
-#define _FX_WIN64_DESKTOP_ 2
-#define _FX_LINUX_DESKTOP_ 4
-#define _FX_MACOSX_ 7
-#define _FX_ANDROID_ 12
-
-// _FXM_PLATFORM_ values;
-#define _FXM_PLATFORM_WINDOWS_ 1 // _FX_WIN32_DESKTOP_ or _FX_WIN64_DESKTOP_.
-#define _FXM_PLATFORM_LINUX_ 2 // _FX_LINUX_DESKTOP_ always.
-#define _FXM_PLATFORM_APPLE_ 3 // _FX_MACOSX_ always.
-#define _FXM_PLATFORM_ANDROID_ 4 // _FX_ANDROID_ always.
+#define _FX_OS_WIN32_ 1
+#define _FX_OS_WIN64_ 2
+#define _FX_OS_LINUX_ 4
+#define _FX_OS_MACOSX_ 7
+#define _FX_OS_ANDROID_ 12
+
+// _FX_PLATFORM_ values;
+#define _FX_PLATFORM_WINDOWS_ 1 // _FX_OS_WIN32_ or _FX_OS_WIN64_.
+#define _FX_PLATFORM_LINUX_ 2 // _FX_OS_LINUX_ always.
+#define _FX_PLATFORM_APPLE_ 3 // _FX_OS_MACOSX_ always.
+#define _FX_PLATFORM_ANDROID_ 4 // _FX_OS_ANDROID_ always.
#ifndef _FX_OS_
#if defined(__ANDROID__)
-#define _FX_OS_ _FX_ANDROID_
-#define _FXM_PLATFORM_ _FXM_PLATFORM_ANDROID_
+#define _FX_OS_ _FX_OS_ANDROID_
+#define _FX_PLATFORM_ _FX_PLATFORM_ANDROID_
#elif defined(_WIN32)
-#define _FX_OS_ _FX_WIN32_DESKTOP_
-#define _FXM_PLATFORM_ _FXM_PLATFORM_WINDOWS_
+#define _FX_OS_ _FX_OS_WIN32_
+#define _FX_PLATFORM_ _FX_PLATFORM_WINDOWS_
#elif defined(_WIN64)
-#define _FX_OS_ _FX_WIN64_DESKTOP_
-#define _FXM_PLATFORM_ _FXM_PLATFORM_WINDOWS_
+#define _FX_OS_ _FX_OS_WIN64_
+#define _FX_PLATFORM_ _FX_PLATFORM_WINDOWS_
#elif defined(__linux__)
-#define _FX_OS_ _FX_LINUX_DESKTOP_
-#define _FXM_PLATFORM_ _FXM_PLATFORM_LINUX_
+#define _FX_OS_ _FX_OS_LINUX_
+#define _FX_PLATFORM_ _FX_PLATFORM_LINUX_
#elif defined(__APPLE__)
-#define _FX_OS_ _FX_MACOSX_
-#define _FXM_PLATFORM_ _FXM_PLATFORM_APPLE_
+#define _FX_OS_ _FX_OS_MACOSX_
+#define _FX_PLATFORM_ _FX_PLATFORM_APPLE_
#endif
#endif // _FX_OS_
@@ -57,15 +57,15 @@
#error Sorry, VC++ 2015 or later is required to compile PDFium.
#endif // defined(_MSC_VER) && _MSC_VER < 1900
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
#include <windows.h>
#include <sal.h>
-#endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
+#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
#include <Carbon/Carbon.h>
#include <libkern/OSAtomic.h>
-#endif // _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
+#endif // _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
#ifdef __cplusplus
extern "C" {
@@ -84,11 +84,11 @@ typedef size_t FX_STRSIZE;
// files larger than 2GB even if the platform does. The value must be signed
// to support -1 error returns.
// TODO(tsepez): support larger files.
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
#define FX_FILESIZE int32_t
-#else // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#else // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
#define FX_FILESIZE off_t
-#endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
#ifndef ASSERT
#ifndef NDEBUG
@@ -154,7 +154,7 @@ extern "C" {
#define FXSYS_wcslen(ptr) ((FX_STRSIZE)wcslen(ptr))
#endif // __cplusplus
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
#define FXSYS_GetACP GetACP
#define FXSYS_itoa _itoa
#define FXSYS_strlwr _strlwr
@@ -181,7 +181,7 @@ size_t FXSYS_wcsftime(wchar_t* strDest,
#define FXSYS_wcsupr _wcsupr
#endif // _NATIVE_WCHAR_T_DEFINED
-#else // _FXM_PLATFORM == _FXM_PLATFORM_WINDOWS_
+#else // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
int FXSYS_GetACP();
char* FXSYS_itoa(int value, char* str, int radix);
@@ -207,7 +207,7 @@ wchar_t* FXSYS_wcslwr(wchar_t* str);
wchar_t* FXSYS_wcsupr(wchar_t* str);
#define FXSYS_pow(a, b) (float)pow(a, b)
#define FXSYS_wcsftime wcsftime
-#endif // _FXM_PLATFORM == _FXM_PLATFORM_WINDOWS_
+#endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
#define FXDWORD_GET_LSBFIRST(p) \
((static_cast<uint32_t>(p[3]) << 24) | (static_cast<uint32_t>(p[2]) << 16) | \
@@ -230,7 +230,7 @@ int FXSYS_round(float f);
// size_t size;
// printf("xyz: %" PRIuS, size);
// The "u" in the macro corresponds to %u, and S is for "size".
-#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ != _FX_PLATFORM_WINDOWS_
#if (defined(_INTTYPES_H) || defined(_INTTYPES_H_)) && !defined(PRId64)
#error "inttypes.h has already been included before this header file, but "
@@ -247,20 +247,20 @@ int FXSYS_round(float f);
#define PRIuS "zu"
#endif
-#else // _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
+#else // _FX_PLATFORM_ != _FX_PLATFORM_WINDOWS_
#if !defined(PRIuS)
#define PRIuS "Iu"
#endif
-#endif // _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
+#endif // _FX_PLATFORM_ != _FX_PLATFORM_WINDOWS_
// Prevent a function from ever being inlined, typically because we'd
// like it to appear in stack traces.
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
#define NEVER_INLINE __declspec(noinline)
-#else // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#else // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
#define NEVER_INLINE __attribute__((__noinline__))
-#endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
#endif // CORE_FXCRT_FX_SYSTEM_H_
diff --git a/core/fxcrt/fx_system_unittest.cpp b/core/fxcrt/fx_system_unittest.cpp
index 6a0fe71abe..73f9c75c1e 100644
--- a/core/fxcrt/fx_system_unittest.cpp
+++ b/core/fxcrt/fx_system_unittest.cpp
@@ -11,7 +11,7 @@
// Unit test covering cases where PDFium replaces well-known library
// functionality on any given platformn.
-#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
+#if _FX_PLATFORM_ != _FX_PLATFORM_WINDOWS_
namespace {
@@ -158,7 +158,7 @@ TEST(fxcrt, FXSYS_i64toa) {
"111111111111111111111111111111111111111111111111111111111111111");
}
-#endif // _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
+#endif // _FX_PLATFORM_ != _FX_PLATFORM_WINDOWS_
TEST(fxcrt, FXSYS_wcsftime) {
struct tm good_time = {};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 19:30:25 +0000