[cairo-commit] src/cairo-cache-private.h src/cairo-clip-private.h src/cairo-fixed-private.h src/cairo-ft-private.h src/cairo-gstate-private.h src/cairo-hash-private.h src/cairoint.h src/cairo-malloc-private.h src/cairo-mutex-private.h src/cairo-mutex-type-private.h src/cairo-os2-private.h src/cairo-output-stream-private.h src/cairo-paginated-surface-private.h src/cairo-path-fixed-private.h src/cairo-pdf-surface-private.h src/cairo-private.h src/cairo-ps-surface-private.h src/cairo-region-private.h src/cairo-scaled-font-private.h src/cairo-surface-private.h src/cairo-svg-surface-private.h src/cairo-type1-private.h src/cairo-wideint-private.h src/cairo-xlib-surface-private.h
Carl Worth
cworth at kemper.freedesktop.org
Thu Aug 23 16:20:18 PDT 2007
src/cairo-cache-private.h | 1 -
src/cairo-clip-private.h | 1 -
src/cairo-fixed-private.h | 1 -
src/cairo-ft-private.h | 1 -
src/cairo-gstate-private.h | 1 -
src/cairo-hash-private.h | 1 -
src/cairo-malloc-private.h | 1 -
src/cairo-mutex-private.h | 4 +++-
src/cairo-mutex-type-private.h | 4 +++-
src/cairo-os2-private.h | 3 +--
src/cairo-output-stream-private.h | 1 -
src/cairo-paginated-surface-private.h | 2 +-
src/cairo-path-fixed-private.h | 2 --
src/cairo-pdf-surface-private.h | 2 --
src/cairo-private.h | 1 -
src/cairo-ps-surface-private.h | 2 --
src/cairo-region-private.h | 2 --
src/cairo-scaled-font-private.h | 2 +-
src/cairo-surface-private.h | 2 +-
src/cairo-svg-surface-private.h | 2 --
src/cairo-type1-private.h | 2 --
src/cairo-wideint-private.h | 2 --
src/cairo-xlib-surface-private.h | 2 --
src/cairoint.h | 2 ++
24 files changed, 12 insertions(+), 32 deletions(-)
New commits:
diff-tree 177a3b8a32f13ce92d45899367fb7758600f7b93 (from fa41ebfb7c074a6ffa6a8fe7c43207e594c6534c)
Author: Carl Worth <cworth at cworth.org>
Date: Thu Aug 23 16:13:04 2007 -0700
Remove include of cairoint.h from *-private.h header files.
These were recently added, (as part of sparse integration?), but they
break boilerplate which reaches into at least cairo-types-private.h
and cairo-scaled-font-private.h. But boilerplate cannot see cairoint.h
or else it gets the internal sybol renaming, (with the INT_ prefix),
and then all the test suite tests refuse to link.
If this change reverts some recently-added functionality, (or
cleanliness), then we'll just need to find some other way to add that
back again without the breakage.
diff --git a/src/cairo-cache-private.h b/src/cairo-cache-private.h
index 3359983..7ab14e2 100644
--- a/src/cairo-cache-private.h
+++ b/src/cairo-cache-private.h
@@ -39,7 +39,6 @@
#ifndef CAIRO_CACHE_PRIVATE_H
#define CAIRO_CACHE_PRIVATE_H
-#include "cairoint.h"
#include "cairo-types-private.h"
/**
diff --git a/src/cairo-clip-private.h b/src/cairo-clip-private.h
index 55ccb08..61559ce 100644
--- a/src/cairo-clip-private.h
+++ b/src/cairo-clip-private.h
@@ -36,7 +36,6 @@
#ifndef CAIRO_CLIP_PRIVATE_H
#define CAIRO_CLIP_PRIVATE_H
-#include "cairoint.h"
#include "cairo-path-fixed-private.h"
extern const cairo_private cairo_rectangle_list_t _cairo_rectangles_nil;
diff --git a/src/cairo-fixed-private.h b/src/cairo-fixed-private.h
index bcc7d0c..35b3748 100644
--- a/src/cairo-fixed-private.h
+++ b/src/cairo-fixed-private.h
@@ -37,7 +37,6 @@
#ifndef CAIRO_FIXED_PRIVATE_H
#define CAIRO_FIXED_PRIVATE_H
-#include "cairoint.h"
#include "cairo-wideint-private.h"
/*
diff --git a/src/cairo-ft-private.h b/src/cairo-ft-private.h
index 55f86ee..3e28f5e 100644
--- a/src/cairo-ft-private.h
+++ b/src/cairo-ft-private.h
@@ -37,7 +37,6 @@
#ifndef CAIRO_FT_PRIVATE_H
#define CAIRO_FT_PRIVATE_H
-#include "cairoint.h"
#include <cairo-ft.h>
#include <cairoint.h>
diff --git a/src/cairo-gstate-private.h b/src/cairo-gstate-private.h
index 276ce9f..2590048 100644
--- a/src/cairo-gstate-private.h
+++ b/src/cairo-gstate-private.h
@@ -36,7 +36,6 @@
#ifndef CAIRO_GSTATE_PRIVATE_H
#define CAIRO_GSTATE_PRIVATE_H
-#include "cairoint.h"
#include "cairo-clip-private.h"
struct _cairo_gstate {
diff --git a/src/cairo-hash-private.h b/src/cairo-hash-private.h
index b0c1e00..8ed3ba8 100644
--- a/src/cairo-hash-private.h
+++ b/src/cairo-hash-private.h
@@ -39,7 +39,6 @@
#ifndef CAIRO_HASH_PRIVATE_H
#define CAIRO_HASH_PRIVATE_H
-#include "cairoint.h"
#include "cairo-types-private.h"
/* XXX: I'd like this file to be self-contained in terms of
diff --git a/src/cairo-malloc-private.h b/src/cairo-malloc-private.h
index bd47957..f503b39 100644
--- a/src/cairo-malloc-private.h
+++ b/src/cairo-malloc-private.h
@@ -37,7 +37,6 @@
#ifndef CAIRO_MALLOC_PRIVATE_H
#define CAIRO_MALLOC_PRIVATE_H
-#include "cairoint.h"
#include "cairo-wideint-private.h"
/**
diff --git a/src/cairo-mutex-private.h b/src/cairo-mutex-private.h
index 7f61b14..88e88bb 100644
--- a/src/cairo-mutex-private.h
+++ b/src/cairo-mutex-private.h
@@ -41,7 +41,9 @@
#ifndef CAIRO_MUTEX_PRIVATE_H
#define CAIRO_MUTEX_PRIVATE_H
-#include "cairoint.h"
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
#include <cairo-features.h>
diff --git a/src/cairo-mutex-type-private.h b/src/cairo-mutex-type-private.h
index 1d82de8..59d581a 100644
--- a/src/cairo-mutex-type-private.h
+++ b/src/cairo-mutex-type-private.h
@@ -41,7 +41,9 @@
#ifndef CAIRO_MUTEX_TYPE_PRIVATE_H
#define CAIRO_MUTEX_TYPE_PRIVATE_H
-#include "cairoint.h"
+#if HAVE_CONFIG_H
+#include "config.h"
+#endif
#include <cairo-features.h>
diff --git a/src/cairo-os2-private.h b/src/cairo-os2-private.h
index 5d67e09..71496ac 100644
--- a/src/cairo-os2-private.h
+++ b/src/cairo-os2-private.h
@@ -38,8 +38,6 @@
#ifndef CAIRO_OS2_PRIVATE_H
#define CAIRO_OS2_PRIVATE_H
-#include "cairoint.h"
-
#define INCL_DOS
#define INCL_DOSSEMAPHORES
#define INCL_DOSERRORS
@@ -52,6 +50,7 @@
#endif
#include <cairo-os2.h>
+#include "cairoint.h"
typedef struct _cairo_os2_surface
{
diff --git a/src/cairo-output-stream-private.h b/src/cairo-output-stream-private.h
index 1812856..0600431 100644
--- a/src/cairo-output-stream-private.h
+++ b/src/cairo-output-stream-private.h
@@ -37,7 +37,6 @@
#ifndef CAIRO_OUTPUT_STREAM_PRIVATE_H
#define CAIRO_OUTPUT_STREAM_PRIVATE_H
-#include "cairoint.h"
#include "cairo-types-private.h"
typedef cairo_status_t (*cairo_output_stream_write_func_t) (cairo_output_stream_t *output_stream,
diff --git a/src/cairo-paginated-surface-private.h b/src/cairo-paginated-surface-private.h
index a9cea07..b406cac 100644
--- a/src/cairo-paginated-surface-private.h
+++ b/src/cairo-paginated-surface-private.h
@@ -36,7 +36,7 @@
#ifndef CAIRO_PAGINATED_SURFACE_H
#define CAIRO_PAGINATED_SURFACE_H
-#include "cairoint.h"
+#include "cairo.h"
#include "cairo-surface-private.h"
diff --git a/src/cairo-path-fixed-private.h b/src/cairo-path-fixed-private.h
index eedab58..65401f3 100644
--- a/src/cairo-path-fixed-private.h
+++ b/src/cairo-path-fixed-private.h
@@ -36,8 +36,6 @@
#ifndef CAIRO_PATH_FIXED_PRIVATE_H
#define CAIRO_PATH_FIXED_PRIVATE_H
-#include "cairoint.h"
-
typedef enum cairo_path_op {
CAIRO_PATH_OP_MOVE_TO = 0,
CAIRO_PATH_OP_LINE_TO = 1,
diff --git a/src/cairo-pdf-surface-private.h b/src/cairo-pdf-surface-private.h
index 7b00ad9..1af2ad0 100644
--- a/src/cairo-pdf-surface-private.h
+++ b/src/cairo-pdf-surface-private.h
@@ -39,8 +39,6 @@
#ifndef CAIRO_PDF_SURFACE_PRIVATE_H
#define CAIRO_PDF_SURFACE_PRIVATE_H
-#include "cairoint.h"
-
#include "cairo-pdf.h"
#include "cairo-surface-private.h"
diff --git a/src/cairo-private.h b/src/cairo-private.h
index bca380e..14cc79a 100644
--- a/src/cairo-private.h
+++ b/src/cairo-private.h
@@ -36,7 +36,6 @@
#ifndef CAIRO_PRIVATE_H
#define CAIRO_PRIVATE_H
-#include "cairoint.h"
#include "cairo-gstate-private.h"
#include "cairo-path-fixed-private.h"
diff --git a/src/cairo-ps-surface-private.h b/src/cairo-ps-surface-private.h
index b6e2432..2499b99 100644
--- a/src/cairo-ps-surface-private.h
+++ b/src/cairo-ps-surface-private.h
@@ -40,8 +40,6 @@
#ifndef CAIRO_PS_SURFACE_PRIVATE_H
#define CAIRO_PS_SURFACE_PRIVATE_H
-#include "cairoint.h"
-
#include "cairo-ps.h"
#include "cairo-surface-private.h"
diff --git a/src/cairo-region-private.h b/src/cairo-region-private.h
index 20be2fa..7f92f9c 100644
--- a/src/cairo-region-private.h
+++ b/src/cairo-region-private.h
@@ -37,8 +37,6 @@
#ifndef CAIRO_REGION_PRIVATE_H
#define CAIRO_REGION_PRIVATE_H
-#include "cairoint.h"
-
#include <pixman.h>
/* cairo_region_t is defined in cairoint.h */
diff --git a/src/cairo-scaled-font-private.h b/src/cairo-scaled-font-private.h
index bd6245c..fa71644 100644
--- a/src/cairo-scaled-font-private.h
+++ b/src/cairo-scaled-font-private.h
@@ -38,7 +38,7 @@
#ifndef CAIRO_SCALED_FONT_PRIVATE_H
#define CAIRO_SCALED_FONT_PRIVATE_H
-#include "cairoint.h"
+#include "cairo.h"
#include "cairo-types-private.h"
#include "cairo-mutex-type-private.h"
diff --git a/src/cairo-surface-private.h b/src/cairo-surface-private.h
index 85b29f7..6193cf8 100644
--- a/src/cairo-surface-private.h
+++ b/src/cairo-surface-private.h
@@ -38,7 +38,7 @@
#ifndef CAIRO_SURFACE_PRIVATE_H
#define CAIRO_SURFACE_PRIVATE_H
-#include "cairoint.h"
+#include "cairo.h"
#include "cairo-types-private.h"
diff --git a/src/cairo-svg-surface-private.h b/src/cairo-svg-surface-private.h
index ee5cf49..e7cd4db 100644
--- a/src/cairo-svg-surface-private.h
+++ b/src/cairo-svg-surface-private.h
@@ -41,8 +41,6 @@
#ifndef CAIRO_SVG_SURFACE_PRIVATE_H
#define CAIRO_SVG_SURFACE_PRIVATE_H
-#include "cairoint.h"
-
#include "cairo-svg.h"
#include "cairo-surface-private.h"
diff --git a/src/cairo-type1-private.h b/src/cairo-type1-private.h
index 03b0039..ae28e05 100644
--- a/src/cairo-type1-private.h
+++ b/src/cairo-type1-private.h
@@ -36,8 +36,6 @@
#ifndef CAIRO_TYPE1_PRIVATE_H
#define CAIRO_TYPE1_PRIVATE_H
-#include "cairoint.h"
-
/* Magic constants for the type1 eexec encryption */
#define CAIRO_TYPE1_ENCRYPT_C1 ((unsigned short) 52845)
#define CAIRO_TYPE1_ENCRYPT_C2 ((unsigned short) 22719)
diff --git a/src/cairo-wideint-private.h b/src/cairo-wideint-private.h
index 7811063..636d8a6 100644
--- a/src/cairo-wideint-private.h
+++ b/src/cairo-wideint-private.h
@@ -37,8 +37,6 @@
#ifndef CAIRO_WIDEINT_H
#define CAIRO_WIDEINT_H
-#include "cairoint.h"
-
#if HAVE_STDINT_H
# include <stdint.h>
#elif HAVE_INTTYPES_H
diff --git a/src/cairo-xlib-surface-private.h b/src/cairo-xlib-surface-private.h
index 16e5868..3bbf43e 100644
--- a/src/cairo-xlib-surface-private.h
+++ b/src/cairo-xlib-surface-private.h
@@ -33,8 +33,6 @@
#ifndef CAIRO_XLIB_SURFACE_PRIVATE_H
#define CAIRO_XLIB_SURFACE_PRIVATE_H
-#include "cairoint.h"
-
#include "cairo-xlib.h"
#include "cairo-surface-private.h"
diff --git a/src/cairoint.h b/src/cairoint.h
index 310fdfd..7b11aaf 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -43,6 +43,8 @@
* existing published interfaces. cworth at cworth.org
*/
+#error Stay out!
+
#ifndef _CAIROINT_H_
#define _CAIROINT_H_
More information about the cairo-commit
mailing list