X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcairo-chart.c;h=3ec00ce9a53920c978afcb05bc2ec598f0cf304c;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=b5e17e0f11d15b143b4b577d0833dcc5e44f8f38;hpb=d0b91eae59319ab2756d0d43b9cb15eb9cd3c234;p=pspp

diff --git a/src/output/cairo-chart.c b/src/output/cairo-chart.c
index b5e17e0f11..3ec00ce9a5 100644
--- a/src/output/cairo-chart.c
+++ b/src/output/cairo-chart.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -35,9 +35,9 @@
 #include "output/cairo.h"
 #include "output/chart-item.h"
 
-#include "error.h"
-#include "xalloc.h"
-#include "xvasprintf.h"
+#include "gl/error.h"
+#include "gl/xalloc.h"
+#include "gl/xvasprintf.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -83,7 +83,7 @@ xrchart_geometry_free (cairo_t *cr UNUSED, struct xrchart_geometry *geom)
   free (geom->dataset);
 }
 
-#if ! PANGO_VERSION_CHECK (2, 22, 0)
+#if ! PANGO_VERSION_CHECK (1, 22, 0)
 int pango_layout_get_baseline (PangoLayout    *layout);
 
 /* Shamelessly copied from the pango source */