From b71fa6e82d9df223f8aa9ef6ef7807b1a45fee76 Mon Sep 17 00:00:00 2001 From: Ralph Giles Date: Thu, 7 Sep 2006 00:37:18 +0000 Subject: Merge the gs853merge branch down into the trunk. This ports ghostpcl and ghostxps to build against a branch of ghostscript close it its current mainline (around r7000) between Ghostscript 8.54 and 8.55. This mostly consists of removing the memory pointers from many calls as well as a few other api changes, as well as some makefile updates, which were skewed between the branches. Nevertheless this is a big merge and there are likely to be a few mistakes. The previous trunk is tagged as /tags/ghostpcl-pre855merge for comparision. Both pcl6 and pspcl6 build and run with the Artifex font scaler (the native gs one). pcl6 compiles but does not link with ufst. pspcl6 does not compile with ufst, but that's not too different from what was happening in the branch. Fixing this will of course come next. git-svn-id: http://svn.ghostscript.com/ghostpcl/trunk/ghostpcl@2566 06663e23-700e-0410-b217-a244a6096597 --- pcl/pcfont.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pcl/pcfont.h') diff --git a/pcl/pcfont.h b/pcl/pcfont.h index 1e8479d7f..ae436354b 100644 --- a/pcl/pcfont.h +++ b/pcl/pcfont.h @@ -111,8 +111,8 @@ int pcl_set_current_font_environment(pcl_state_t *pcs); /* debugging to to print font parameters */ #ifdef DEBUG -void dprint_font_params_t(const gs_memory_t *mem, const pl_font_params_t *pfp); +void dprint_font_params_t(const pl_font_params_t *pfp); #else -#define dprint_font_params_t(mem, p) DO_NOTHING +#define dprint_font_params_t(p) DO_NOTHING #endif /* DEBUG */ #endif /* pcfont_INCLUDED */ -- cgit v1.2.3