cvs: php4 /ext/cpdf cpdf.c php_cpdf.h

iliaa Tue Jan 14 19:52:07 2003 EDT Modified files: /php4/ext/cpdf cpdf.c php_cpdf.h Log: This patch allows cpdf to be compiled in conjunction with ncurses, which was not possible before due to conflicting defines. Index: php4/ext/cpdf/cpdf.c diff -u php4/ext/cpdf/cpdf.c:1.49 php4/ext/cpdf/cpdf.c:1.50 --- php4/ext/cpdf/cpdf.c:1.49 Tue Jan 14 15:02:42 2003 +++ php4/ext/cpdf/cpdf.c Tue Jan 14 19:52:06 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cpdf.c,v 1.49 2003/01/14 20:02:42 iliaa Exp $ */ +/* $Id: cpdf.c,v 1.50 2003/01/15 00:52:06 iliaa Exp $ */ /* cpdflib.h -- C language API definitions for ClibPDF library * Copyright (C) 1998 FastIO Systems, All Rights Reserved. */ @@ -44,6 +44,8 @@ # include <gd.h> # endif #endif + +#include <cpdflib.h> #ifdef HAVE_UNISTD_H # include <unistd.h> Index: php4/ext/cpdf/php_cpdf.h diff -u php4/ext/cpdf/php_cpdf.h:1.13 php4/ext/cpdf/php_cpdf.h:1.14 --- php4/ext/cpdf/php_cpdf.h:1.13 Tue Dec 31 11:06:19 2002 +++ php4/ext/cpdf/php_cpdf.h Tue Jan 14 19:52:06 2003 @@ -15,7 +15,7 @@ | Author: Uwe Steinmann <Uwe.Steinmann@fernuni-hagen.de> | +----------------------------------------------------------------------+ */ -/* $Id: php_cpdf.h,v 1.13 2002/12/31 16:06:19 sebastian Exp $ */ +/* $Id: php_cpdf.h,v 1.14 2003/01/15 00:52:06 iliaa Exp $ */ #ifndef PHP_CPDF_H #define PHP_CPDF_H @@ -28,8 +28,6 @@ #ifdef T #undef T #endif - -#include <cpdflib.h> extern zend_module_entry cpdf_module_entry; #define cpdf_module_ptr &cpdf_module_entry