[cairo-commit] cairo/src cairo_wideint.h, 1.2, 1.3 cairoint.h, 1.77, 1.78

[Carl Worth]

Committed by: cworth

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

Modified Files:
	cairo_wideint.h cairoint.h 
Log Message:

        * src/cairoint.h:
        * src/cairo_wideint.h: Rename __internal_linkage to cairo_private
        and move it to the beginning of the line for function
        declarations. Also, drop unneeded "extern" from function
        declarations.

Index: cairo_wideint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_wideint.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cairo_wideint.h	21 Dec 2004 21:14:46 -0000	1.2
+++ cairo_wideint.h	21 Dec 2004 21:22:44 -0000	1.3
@@ -33,7 +33,7 @@
  * as a pair of 32-bit ints
  */
 
-#define I __internal_linkage
+#define I cairo_private
 
 #if !HAVE_UINT64_T
 

Index: cairoint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairoint.h,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- cairoint.h	21 Dec 2004 21:14:46 -0000	1.77
+++ cairoint.h	21 Dec 2004 21:22:44 -0000	1.78
@@ -64,7 +64,7 @@
 # define slim_hidden_proto1(name, internal)				\
   extern __typeof (name) name						\
 	__asm__ (slim_hidden_asmname (internal))			\
-	__internal_linkage;
+	cairo_private;
 # define slim_hidden_def1(name, internal)				\
   extern __typeof (name) EXT_##name __asm__(slim_hidden_asmname(name))	\
 	__attribute__((__alias__(slim_hidden_asmname(internal))))
@@ -80,12 +80,11 @@
 
 /* slim_internal.h */
[...1028 lines suppressed...]
-extern void __internal_linkage
+cairo_private void
 _cairo_pattern_prepare_surface (cairo_pattern_t *pattern);
 
-extern void __internal_linkage
+cairo_private void
 _cairo_pattern_shader_init (cairo_pattern_t *pattern,
 			    cairo_shader_op_t *op);
 
-extern void __internal_linkage
+cairo_private void
 _cairo_pattern_calc_color_at_pixel (cairo_shader_op_t *op,
 				    cairo_fixed_t factor,
 				    int *pixel);
 
-extern cairo_image_surface_t __internal_linkage *
+cairo_private cairo_image_surface_t *
 _cairo_pattern_get_image (cairo_pattern_t *pattern, cairo_box_t *box);
 
 /* Avoid unnecessary PLT entries.  */