diff options
author | Owen Taylor <otaylor@redhat.com> | 2000-07-06 20:07:41 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2000-07-06 20:07:41 +0000 |
commit | 3d95e7ed152e045e311f855a8028746fc9ab38be (patch) | |
tree | 689f158866b2c1ad4b889f8fd4143b4783e7ba91 /pango | |
parent | bb034ea234b9c7fdc4556a270cae042ab6db249d (diff) | |
download | pango-3d95e7ed152e045e311f855a8028746fc9ab38be.tar.gz |
Released 0.12
Thu Jul 6 15:24:38 2000 Owen Taylor <otaylor@redhat.com>
* Released 0.12
* gdk/Makefile.am: Fix missing \ which was causing
srcdir != builddir builds to fail.
Diffstat (limited to 'pango')
-rw-r--r-- | pango/Makefile.am | 6 | ||||
-rw-r--r-- | pango/pango-coverage.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pango/Makefile.am b/pango/Makefile.am index ee0961bc..99888ace 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -1,7 +1,9 @@ ## Process this file with automake to create Makefile.in. -INCLUDES=-DSYSCONFDIR=\"$(sysconfdir)\" -DLIBDIR=\"$(libdir)\" - -I$(top_srcdir) +INCLUDES = \ + -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DLIBDIR=\"$(libdir)\" \ + -I$(top_srcdir) lib_LTLIBRARIES = libpango.la libpangox.la bin_PROGRAMS = pango-querymodules diff --git a/pango/pango-coverage.c b/pango/pango-coverage.c index eda0ace3..1e090f41 100644 --- a/pango/pango-coverage.c +++ b/pango/pango-coverage.c @@ -57,7 +57,6 @@ struct _PangoCoverage PangoCoverage * pango_coverage_new (void) { - int i; PangoCoverage *coverage = g_new (PangoCoverage, 1); coverage->n_blocks = N_BLOCKS_INCREMENT; @@ -117,7 +116,7 @@ pango_coverage_copy (PangoCoverage *coverage) PangoCoverage * pango_coverage_ref (PangoCoverage *coverage) { - g_return_if_fail (coverage != NULL); + g_return_val_if_fail (coverage != NULL, NULL); coverage->ref_count++; |