Thu, 15 Jan 2015 21:03:48 +0100
Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)
1 diff --git a/gfx/cairo/libpixman/src/pixman.h b/gfx/cairo/libpixman/src/pixman.h
2 --- a/gfx/cairo/libpixman/src/pixman.h
3 +++ b/gfx/cairo/libpixman/src/pixman.h
4 @@ -64,16 +64,18 @@ SOFTWARE.
5 * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
6 * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
7 * PERFORMANCE OF THIS SOFTWARE.
8 */
10 #ifndef PIXMAN_H__
11 #define PIXMAN_H__
13 +#include "cairo-platform.h"
14 +
15 #include <pixman-version.h>
17 /*
18 * Standard integers
19 */
20 #if defined (_SVR4) || defined (SVR4) || defined (__OpenBSD__) || defined (_sgi) || defined (__sun) || defined (sun) || defined (__digital__)
21 # include <inttypes.h>
22 #elif defined (_MSC_VER)