OLD | NEW |
1 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ | 1 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
2 /* ***** BEGIN LICENSE BLOCK ***** | 2 /* ***** BEGIN LICENSE BLOCK ***** |
3 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 | 3 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
4 * | 4 * |
5 * The contents of this file are subject to the Mozilla Public License Version | 5 * The contents of this file are subject to the Mozilla Public License Version |
6 * 1.1 (the "License"); you may not use this file except in compliance with | 6 * 1.1 (the "License"); you may not use this file except in compliance with |
7 * the License. You may obtain a copy of the License at | 7 * the License. You may obtain a copy of the License at |
8 * http://www.mozilla.org/MPL/ | 8 * http://www.mozilla.org/MPL/ |
9 * | 9 * |
10 * Software distributed under the License is distributed on an "AS IS" basis, | 10 * Software distributed under the License is distributed on an "AS IS" basis, |
(...skipping 30 matching lines...) Expand all Loading... |
41 #if defined(__OS2__) | 41 #if defined(__OS2__) |
42 #pragma pack(1) | 42 #pragma pack(1) |
43 #endif | 43 #endif |
44 | 44 |
45 /* BEGIN GOOGLE MODIFICATIONS */ | 45 /* BEGIN GOOGLE MODIFICATIONS */ |
46 | 46 |
47 #ifndef __native_client__ | 47 #ifndef __native_client__ |
48 #include "nptypes.h" | 48 #include "nptypes.h" |
49 #endif | 49 #endif |
50 | 50 |
51 #ifdef __native_client__ | |
52 #include <stdint.h> | 51 #include <stdint.h> |
53 #include <sys/types.h> | 52 #include <sys/types.h> |
54 #else | |
55 #include "base/basictypes.h" | |
56 #endif /* __native_client__ */ | |
57 | 53 |
58 /* END GOOGLE MODIFICATIONS */ | 54 /* END GOOGLE MODIFICATIONS */ |
59 | 55 |
60 #if defined(__OS2__) || defined(OS2) | 56 #if defined(__OS2__) || defined(OS2) |
61 #ifndef XP_OS2 | 57 #ifndef XP_OS2 |
62 #define XP_OS2 1 | 58 #define XP_OS2 1 |
63 #endif | 59 #endif |
64 #endif | 60 #endif |
65 | 61 |
66 #if defined(_WIN32) && !defined(__SYMBIAN32__) | 62 #if defined(_WIN32) && !defined(__SYMBIAN32__) |
(...skipping 849 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
916 #ifdef __cplusplus | 912 #ifdef __cplusplus |
917 } /* end extern "C" */ | 913 } /* end extern "C" */ |
918 #endif | 914 #endif |
919 | 915 |
920 #endif /* RC_INVOKED */ | 916 #endif /* RC_INVOKED */ |
921 #if defined(__OS2__) | 917 #if defined(__OS2__) |
922 #pragma pack() | 918 #pragma pack() |
923 #endif | 919 #endif |
924 | 920 |
925 #endif /* npapi_h_ */ | 921 #endif /* npapi_h_ */ |
OLD | NEW |