[cairo-commit] cairo/src cairo-gstate.c, 1.104, 1.105 cairo-png.c, 1.5, 1.6 cairo-win32-font.c, 1.14, 1.15 cairo-win32-surface.c, 1.15, 1.16 cairo-win32.h, 1.7, 1.8 cairoint.h, 1.120, 1.121

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv18944/src

Modified Files:
	cairo-gstate.c cairo-png.c cairo-win32-font.c 
	cairo-win32-surface.c cairo-win32.h cairoint.h 
Log Message:

        * src/cairo-gstate.c:
        * src/cairo-png.c:
        * src/cairo-win32-font.c:
        * src/cairo-win32-surface.c:
        * src/cairo-win32.h:
        * src/cairoint.h: Minor changes to header file inclusion
        recommended by Oleg Smolsky for better portability to MSVC.


Index: cairo-gstate.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-gstate.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- cairo-gstate.c	7 Apr 2005 18:04:00 -0000	1.104
+++ cairo-gstate.c	7 Apr 2005 19:56:43 -0000	1.105
@@ -35,7 +35,6 @@
  */
 
 #include <stdlib.h>
-#include <math.h>
 
 #include "cairoint.h"
 

Index: cairo-png.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-png.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cairo-png.c	7 Apr 2005 19:35:33 -0000	1.5
+++ cairo-png.c	7 Apr 2005 19:56:43 -0000	1.6
@@ -36,8 +36,8 @@
  */
 
 #include <png.h>
-#include "cairo-png.h"
 #include "cairoint.h"
+#include "cairo-png.h"
 
 
 static void
@@ -339,3 +339,4 @@
 
     return NULL;
 }
+#undef PNG_SIG_SIZE

Index: cairo-win32-font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-win32-font.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- cairo-win32-font.c	7 Apr 2005 19:38:02 -0000	1.14
+++ cairo-win32-font.c	7 Apr 2005 19:56:43 -0000	1.15
@@ -34,7 +34,7 @@
 
 #include <string.h>
 #include <stdio.h>
-
+#include "cairoint.h"
 #include "cairo-win32-private.h"
 
 #ifndef SPI_GETFONTSMOOTHINGTYPE 

Index: cairo-win32-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-win32-surface.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- cairo-win32-surface.c	7 Apr 2005 18:04:00 -0000	1.15
+++ cairo-win32-surface.c	7 Apr 2005 19:56:43 -0000	1.16
@@ -34,7 +34,7 @@
  */
 
 #include <stdio.h>
-
+#include "cairoint.h"
 #include "cairo-win32-private.h"
 
 static const cairo_surface_backend_t cairo_win32_surface_backend;

Index: cairo-win32.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-win32.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- cairo-win32.h	7 Apr 2005 18:04:00 -0000	1.7
+++ cairo-win32.h	7 Apr 2005 19:56:43 -0000	1.8
@@ -34,6 +34,7 @@
  */
 
 #ifndef _CAIRO_WIN32_H_
+#define _CAIRO_WIN32_H_
 
 #include <cairo.h>
 

Index: cairoint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairoint.h,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- cairoint.h	7 Apr 2005 19:05:52 -0000	1.120
+++ cairoint.h	7 Apr 2005 19:56:43 -0000	1.121
@@ -52,6 +52,10 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+
+#ifdef _MSC_VER
+#define _USE_MATH_DEFINES
+#endif
 #include <math.h>
 #include <limits.h>
 #include <stdio.h>