| OLD | NEW |
| 1 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ | 1 /* -*- Mode: C++; tab-width: 2; 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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 #define uIntf MOZ_Z_uIntf | 153 #define uIntf MOZ_Z_uIntf |
| 154 #define uLong MOZ_Z_uLong | 154 #define uLong MOZ_Z_uLong |
| 155 #define uLongf MOZ_Z_uLongf | 155 #define uLongf MOZ_Z_uLongf |
| 156 #define voidp MOZ_Z_voidp | 156 #define voidp MOZ_Z_voidp |
| 157 #define voidpc MOZ_Z_voidpc | 157 #define voidpc MOZ_Z_voidpc |
| 158 #define voidpf MOZ_Z_voidpf | 158 #define voidpf MOZ_Z_voidpf |
| 159 #define gz_header_s MOZ_Z_gz_header_s | 159 #define gz_header_s MOZ_Z_gz_header_s |
| 160 #define internal_state MOZ_Z_internal_state | 160 #define internal_state MOZ_Z_internal_state |
| 161 | 161 |
| 162 /* Mangle Byte types except on Mac. */ | 162 /* Mangle Byte types except on Mac. */ |
| 163 #if !defined(__MACTYPES__) | 163 #if !defined(__MACTYPES__) && !defined(OS_ANDROID) |
| 164 #define Byte MOZ_Z_Byte | 164 #define Byte MOZ_Z_Byte |
| 165 #define Bytef MOZ_Z_Bytef | 165 #define Bytef MOZ_Z_Bytef |
| 166 #endif | 166 #endif |
| 167 | 167 |
| 168 #endif | 168 #endif |
| OLD | NEW |