[cairo-commit] cairo/src Makefile.am,1.18,1.19 cairo.h,1.40,1.41 cairo_traps.c,1.12,1.13

[Richard Worth]

Committed by: rworth

Update of /cvs/cairo/cairo/src
In directory pdx:/tmp/cvs-serv23971/src

Modified Files:
	Makefile.am cairo.h cairo_traps.c 
Log Message:
	* src/Makefile.am: Add '-no-undefined' to end of
	libcairo_la_LDFLAGS to enable building shared library under
	cygwin.

	* src/cairo.h: Remove all 'extern ' and ' __external_linkage'
	(macro for __declspec(dllexport) and __declspec(dllimport))
	from function declarations. These are no longer needed for cygwin.

	* src/cairo_traps.c: Changed type of _line_segs_intersect_ceil
	from 'static cairo_fixed_t' to 'static int' to match definition.
	This was necessary to compile under cygwin.


Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/src/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Makefile.am	13 Dec 2003 00:00:28 -0000	1.18
--- Makefile.am	23 Jan 2004 04:47:24 -0000	1.19
***************
*** 43,47 ****
  	cairoint.h
  
! libcairo_la_LDFLAGS = -version-info @VERSION_INFO@
  
  INCLUDES = -I$(srcdir) $(CAIRO_CFLAGS) $(FONTCONFIG_CFLAGS) $(XRENDER_CFLAGS) $(X_CFLAGS)
--- 43,47 ----
  	cairoint.h
  
! libcairo_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
  
  INCLUDES = -I$(srcdir) $(CAIRO_CFLAGS) $(FONTCONFIG_CFLAGS) $(XRENDER_CFLAGS) $(X_CFLAGS)

Index: cairo.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** cairo.h	17 Dec 2003 20:59:37 -0000	1.40
--- cairo.h	23 Jan 2004 04:47:24 -0000	1.41
***************
*** 42,85 ****
  #endif
  
- /* From slim_export.h and slim_import.h */
- #if defined(WIN32) || defined(__CYGWIN__)
- # if defined(_CAIROINT_H_)
- #  define __external_linkage	__declspec(dllexport)
- # else
- #  define __external_linkage	__declspec(dllimport)
- # endif
- #else
[...983 lines suppressed...]
! cairo_status_t
  cairo_matrix_invert (cairo_matrix_t *matrix);
  
! cairo_status_t
  cairo_matrix_multiply (cairo_matrix_t *result, const cairo_matrix_t *a, const cairo_matrix_t *b);
  
! cairo_status_t
  cairo_matrix_transform_distance (cairo_matrix_t *matrix, double *dx, double *dy);
  
! cairo_status_t
  cairo_matrix_transform_point (cairo_matrix_t *matrix, double *x, double *y);
  
***************
*** 721,725 ****
  #endif
  
- #undef __external_linkage
- 
  #endif
--- 710,712 ----

Index: cairo_traps.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_traps.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** cairo_traps.c	7 Nov 2003 02:33:28 -0000	1.12
--- cairo_traps.c	23 Jan 2004 04:47:24 -0000	1.13
***************
*** 59,63 ****
  _compute_x_intercept (cairo_line_t *l, double inverse_slope);
  
! static cairo_fixed_t
  _line_segs_intersect_ceil (cairo_line_t *left, cairo_line_t *right, cairo_fixed_t *y_ret);
  
--- 59,63 ----
  _compute_x_intercept (cairo_line_t *l, double inverse_slope);
  
! static int
  _line_segs_intersect_ceil (cairo_line_t *left, cairo_line_t *right, cairo_fixed_t *y_ret);