| 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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 | 106 // BEGIN GOOGLE MODIFICATIONS |
| 107 // On Linux and Mac, be sure to set Mozilla-specific macros. | 107 // On Linux and Mac, be sure to set Mozilla-specific macros. |
| 108 #if defined(OS_LINUX) | 108 #if defined(OS_LINUX) || defined(OS_FREEBSD) |
| 109 #define XP_UNIX 1 | 109 #define XP_UNIX 1 |
| 110 #define MOZ_X11 1 | 110 #define MOZ_X11 1 |
| 111 #elif defined(OS_MACOSX) | 111 #elif defined(OS_MACOSX) |
| 112 #ifndef XP_MACOSX | 112 #ifndef XP_MACOSX |
| 113 #define XP_MACOSX 1 | 113 #define XP_MACOSX 1 |
| 114 #endif | 114 #endif |
| 115 #endif | 115 #endif |
| 116 // END GOOGLE MODIFICATIONS | 116 // END GOOGLE MODIFICATIONS |
| 117 | 117 |
| 118 #ifdef __MWERKS__ | 118 #ifdef __MWERKS__ |
| (...skipping 679 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 798 #ifdef __cplusplus | 798 #ifdef __cplusplus |
| 799 } /* end extern "C" */ | 799 } /* end extern "C" */ |
| 800 #endif | 800 #endif |
| 801 | 801 |
| 802 #endif /* RC_INVOKED */ | 802 #endif /* RC_INVOKED */ |
| 803 #ifdef __OS2__ | 803 #ifdef __OS2__ |
| 804 #pragma pack() | 804 #pragma pack() |
| 805 #endif | 805 #endif |
| 806 | 806 |
| 807 #endif /* _NPAPI_H_ */ | 807 #endif /* _NPAPI_H_ */ |
| OLD | NEW |