| 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 //#ifdef XP_WIN | 96 //#ifdef XP_WIN |
| 97 #include <windows.h> | 97 #include <windows.h> |
| 98 //#endif // XP_WIN | 98 //#endif // XP_WIN |
| 99 // END GOOGLE MODIFICATIONS | 99 // END GOOGLE MODIFICATIONS |
| 100 | 100 |
| 101 # ifndef XP_WIN | 101 # ifndef XP_WIN |
| 102 # define XP_WIN 1 | 102 # define XP_WIN 1 |
| 103 # endif /* XP_WIN */ | 103 # endif /* XP_WIN */ |
| 104 #endif /* _WINDOWS */ | 104 #endif /* _WINDOWS */ |
| 105 | 105 |
| 106 // BEGIN GOOGLE MODIFICATIONS |
| 107 // On Linux, be sure to set the Mozilla-specific flag. |
| 108 #ifdef OS_LINUX |
| 109 #define XP_UNIX 1 |
| 110 #endif |
| 111 // END GOOGLE MODIFICATIONS |
| 112 |
| 106 #ifdef __MWERKS__ | 113 #ifdef __MWERKS__ |
| 107 # define _declspec __declspec | 114 # define _declspec __declspec |
| 108 # ifdef __INTEL__ | 115 # ifdef __INTEL__ |
| 109 # undef NULL | 116 # undef NULL |
| 110 # ifndef XP_WIN | 117 # ifndef XP_WIN |
| 111 # define XP_WIN 1 | 118 # define XP_WIN 1 |
| 112 # endif /* XP_WIN */ | 119 # endif /* XP_WIN */ |
| 113 # endif /* __INTEL__ */ | 120 # endif /* __INTEL__ */ |
| 114 #endif /* __MWERKS__ */ | 121 #endif /* __MWERKS__ */ |
| 115 | 122 |
| (...skipping 663 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 779 #ifdef __cplusplus | 786 #ifdef __cplusplus |
| 780 } /* end extern "C" */ | 787 } /* end extern "C" */ |
| 781 #endif | 788 #endif |
| 782 | 789 |
| 783 #endif /* RC_INVOKED */ | 790 #endif /* RC_INVOKED */ |
| 784 #ifdef __OS2__ | 791 #ifdef __OS2__ |
| 785 #pragma pack() | 792 #pragma pack() |
| 786 #endif | 793 #endif |
| 787 | 794 |
| 788 #endif /* _NPAPI_H_ */ | 795 #endif /* _NPAPI_H_ */ |
| OLD | NEW |