Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 PDFium Authors. All rights reserved. | 1 // Copyright 2014 PDFium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com | 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com |
| 6 | 6 |
| 7 #ifndef CORE_INCLUDE_FXCRT_FX_SYSTEM_H_ | 7 #ifndef CORE_INCLUDE_FXCRT_FX_SYSTEM_H_ |
| 8 #define CORE_INCLUDE_FXCRT_FX_SYSTEM_H_ | 8 #define CORE_INCLUDE_FXCRT_FX_SYSTEM_H_ |
| 9 | 9 |
| 10 #include <assert.h> | 10 #include <assert.h> |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 48 #define _FXM_PLATFORM_ _FXM_PLATFORM_APPLE_ | 48 #define _FXM_PLATFORM_ _FXM_PLATFORM_APPLE_ |
| 49 #endif | 49 #endif |
| 50 #endif // _FX_OS_ | 50 #endif // _FX_OS_ |
| 51 | 51 |
| 52 #if !defined(_FX_OS_) || _FX_OS_ == 0 | 52 #if !defined(_FX_OS_) || _FX_OS_ == 0 |
| 53 #error Sorry, can not figure out target OS. Please specify _FX_OS_ macro. | 53 #error Sorry, can not figure out target OS. Please specify _FX_OS_ macro. |
| 54 #endif | 54 #endif |
| 55 | 55 |
| 56 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ | 56 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ |
| 57 #define _CRT_SECURE_NO_WARNINGS | 57 #define _CRT_SECURE_NO_WARNINGS |
| 58 #include <windows.h> | |
|
dsinclair
2016/02/18 16:22:58
I don't know why the script does this, but it want
Tom Sepez
2016/02/18 19:39:57
Acknowledged.
| |
| 58 #include <sal.h> | 59 #include <sal.h> |
| 59 #include <windows.h> | |
| 60 #endif | 60 #endif |
| 61 | 61 |
| 62 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ | 62 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ |
| 63 #include <Carbon/Carbon.h> | |
| 63 #include <libkern/OSAtomic.h> | 64 #include <libkern/OSAtomic.h> |
| 64 #include <Carbon/Carbon.h> | |
| 65 #endif | 65 #endif |
| 66 | 66 |
| 67 #ifdef __cplusplus | 67 #ifdef __cplusplus |
| 68 extern "C" { | 68 extern "C" { |
| 69 #endif | 69 #endif |
| 70 typedef void* FX_POSITION; // Keep until fxcrt containers gone | 70 typedef void* FX_POSITION; // Keep until fxcrt containers gone |
| 71 typedef unsigned short FX_WORD; // Keep - "an efficient small type" | 71 typedef unsigned short FX_WORD; // Keep - "an efficient small type" |
| 72 typedef unsigned int FX_DWORD; // Keep - "an efficient type" | 72 typedef unsigned int FX_DWORD; // Keep - "an efficient type" |
| 73 typedef float FX_FLOAT; // Keep, allow upgrade to doubles. | 73 typedef float FX_FLOAT; // Keep, allow upgrade to doubles. |
| 74 typedef int FX_BOOL; // Keep, sadly not always 0 or 1. | 74 typedef int FX_BOOL; // Keep, sadly not always 0 or 1. |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 312 | 312 |
| 313 // Prevent a function from ever being inlined, typically because we'd | 313 // Prevent a function from ever being inlined, typically because we'd |
| 314 // like it to appear in stack traces. | 314 // like it to appear in stack traces. |
| 315 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ | 315 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ |
| 316 #define NEVER_INLINE __declspec(noinline) | 316 #define NEVER_INLINE __declspec(noinline) |
| 317 #else // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ | 317 #else // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ |
| 318 #define NEVER_INLINE __attribute__((__noinline__)) | 318 #define NEVER_INLINE __attribute__((__noinline__)) |
| 319 #endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ | 319 #endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ |
| 320 | 320 |
| 321 #endif // CORE_INCLUDE_FXCRT_FX_SYSTEM_H_ | 321 #endif // CORE_INCLUDE_FXCRT_FX_SYSTEM_H_ |
| OLD | NEW |