[cairo-commit] src/cairo-debug.h src/cairo.h src/cairoint.h src/Makefile.am test/cairo-test.h

[Carl Worth]

 src/Makefile.am   |    4 +---
 src/cairo-debug.h |   48 ------------------------------------------------
 src/cairo.h       |    4 ++++
 src/cairoint.h    |    1 -
 test/cairo-test.h |    1 -
 5 files changed, 5 insertions(+), 53 deletions(-)

New commits:
diff-tree 0a1ec91977ef05f04e2cc52895fd98a903f1c8eb (from 89384ae12474c257fb47e4231229235207ab8f85)
Author: Carl Worth <cworth at cworth.org>
Date:   Mon May 22 09:22:42 2006 -0700

    Move prototype of cairo_debug_reset_static_data from uninstalled cairo-debug.h to cairo.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 6390d32..29603a0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -86,8 +86,7 @@ endif
 # Headers that declare the functions in the cairo DLL API on Windows
 cairo_win32_api_headers = \
 	$(srcdir)/cairo.h \
-	$(srcdir)/cairo-win32.h \
-	$(srcdir)/cairo-debug.h
+	$(srcdir)/cairo-win32.h
 
 if CAIRO_HAS_GLITZ_SURFACE
 cairo_win32_api_headers += \
@@ -141,7 +140,6 @@ libcairo_la_SOURCES =				\
 	cairo-clip-private.h			\
 	cairo-color.c				\
 	cairo-debug.c				\
-	cairo-debug.h				\
 	cairo-fixed.c				\
 	cairo-font.c				\
 	cairo-font-options.c			\
diff --git a/src/cairo-debug.h b/src/cairo-debug.h
deleted file mode 100644
index 1dab2c7..0000000
--- a/src/cairo-debug.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* cairo - a vector graphics library with display and print output
- *
- * Copyright © 2005 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it either under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * (the "LGPL") or, at your option, under the terms of the Mozilla
- * Public License Version 1.1 (the "MPL"). If you do not alter this
- * notice, a recipient may use your version of this file under either
- * the MPL or the LGPL.
- *
- * You should have received a copy of the LGPL along with this library
- * in the file COPYING-LGPL-2.1; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * You should have received a copy of the MPL along with this library
- * in the file COPYING-MPL-1.1
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
- * OF ANY KIND, either express or implied. See the LGPL or the MPL for
- * the specific language governing rights and limitations.
- *
- * The Original Code is the cairo graphics library.
- *
- * The Initial Developer of the Original Code is Red Hat, Inc.
- *
- * Contributor(s):
- *	Carl D. Worth <cworth at cworth.org>
- */
-
-#ifndef CAIRO_DEBUG_H
-#define CAIRO_DEBUG_H
-
-#include <cairo-features.h>
-
-CAIRO_BEGIN_DECLS
-
-void
-cairo_debug_reset_static_data (void);
-
-CAIRO_END_DECLS
-
-#endif /* CAIRO_H */
diff --git a/src/cairo.h b/src/cairo.h
index 5bf6984..b8738fc 100644
--- a/src/cairo.h
+++ b/src/cairo.h
@@ -1552,6 +1552,10 @@ cairo_public void
 cairo_matrix_transform_point (const cairo_matrix_t *matrix,
 			      double *x, double *y);
 
+/* Functions to be used while debugging (not intended for use in production code) */
+cairo_public void
+cairo_debug_reset_static_data (void);
+
 #ifndef _CAIROINT_H_
 
 /* Obsolete functions. These definitions exist to coerce the compiler
diff --git a/src/cairoint.h b/src/cairoint.h
index 75a2ebb..86610e1 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -63,7 +63,6 @@
 #include <stdio.h>
 
 #include "cairo.h"
-#include "cairo-debug.h"
 #include <pixman.h>
 
 CAIRO_BEGIN_DECLS
diff --git a/test/cairo-test.h b/test/cairo-test.h
index ea5101d..7327182 100644
--- a/test/cairo-test.h
+++ b/test/cairo-test.h
@@ -32,7 +32,6 @@
 
 #include <math.h>
 #include <cairo.h>
-#include <cairo-debug.h>
 
 CAIRO_BEGIN_DECLS