From 143344161ec92453a76161952eae784f1930424f Mon Sep 17 00:00:00 2001
From: Nicola Fontana <ntd@entidi.it>
Date: Tue, 8 Sep 2009 15:36:09 +0200
Subject: [PATCH] [CPML] Updated includes for cpml-util.h

Renamed #include <cpml/cpml-macros.h> to #include <cpml/cpml-util.h>.
---
 cpml/cpml-arc.h   | 9 +--------
 cpml/cpml-close.h | 2 +-
 cpml/cpml-curve.h | 2 +-
 cpml/cpml-line.h  | 2 +-
 cpml/cpml-pair.c  | 1 -
 cpml/cpml.h       | 2 +-
 6 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/cpml/cpml-arc.h b/cpml/cpml-arc.h
index 41b87192..26089f4f 100644
--- a/cpml/cpml-arc.h
+++ b/cpml/cpml-arc.h
@@ -21,14 +21,7 @@
 #define __CPML_ARC_H__
 
 #include <cpml/cpml-primitive.h>
-#include <cpml/cpml-macros.h>
-
-#ifndef CAIRO_PATH_ARC_TO
-#define CAIRO_PATH_ARC_TO       100
-#undef  CAIRO_HAS_ARC_SUPPORT
-#else
-#define CAIRO_HAS_ARC_SUPPORT   1
-#endif
+#include <cpml/cpml-util.h>
 
 
 CAIRO_BEGIN_DECLS
diff --git a/cpml/cpml-close.h b/cpml/cpml-close.h
index 49ac7080..b1f81557 100644
--- a/cpml/cpml-close.h
+++ b/cpml/cpml-close.h
@@ -21,7 +21,7 @@
 #define __CPML_CLOSE_H__
 
 #include <cpml/cpml-primitive.h>
-#include <cpml/cpml-macros.h>
+#include <cpml/cpml-util.h>
 
 
 CAIRO_BEGIN_DECLS
diff --git a/cpml/cpml-curve.h b/cpml/cpml-curve.h
index 929e6fac..bae2bda0 100644
--- a/cpml/cpml-curve.h
+++ b/cpml/cpml-curve.h
@@ -21,7 +21,7 @@
 #define __CPML_CURVE_H__
 
 #include <cpml/cpml-primitive.h>
-#include <cpml/cpml-macros.h>
+#include <cpml/cpml-util.h>
 
 
 CAIRO_BEGIN_DECLS
diff --git a/cpml/cpml-line.h b/cpml/cpml-line.h
index 91381fe1..c0fea6a2 100644
--- a/cpml/cpml-line.h
+++ b/cpml/cpml-line.h
@@ -21,7 +21,7 @@
 #define __CPML_LINE_H__
 
 #include <cpml/cpml-primitive.h>
-#include <cpml/cpml-macros.h>
+#include <cpml/cpml-util.h>
 
 
 CAIRO_BEGIN_DECLS
diff --git a/cpml/cpml-pair.c b/cpml/cpml-pair.c
index 587ebed3..e2a4e22a 100644
--- a/cpml/cpml-pair.c
+++ b/cpml/cpml-pair.c
@@ -56,7 +56,6 @@
 
 
 #include "cpml-pair.h"
-#include "cpml-macros.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/cpml/cpml.h b/cpml/cpml.h
index bca9e40e..2c9b8958 100644
--- a/cpml/cpml.h
+++ b/cpml/cpml.h
@@ -23,9 +23,9 @@
 #include <cpml/cpml-arc.h>
 #include <cpml/cpml-curve.h>
 #include <cpml/cpml-line.h>
-#include <cpml/cpml-macros.h>
 #include <cpml/cpml-pair.h>
 #include <cpml/cpml-primitive.h>
 #include <cpml/cpml-segment.h>
+#include <cpml/cpml-util.h>
 
 #endif /* __CPML_H__ */
-- 
2.11.4.GIT