cvs: php4 /ext/pdf pdf.c php_pdf.h

derick Thu Nov 8 18:37:33 2001 EDT Modified files: /php4/ext/pdf pdf.c php_pdf.h Log: - Let it also work with pdflib 3 again Index: php4/ext/pdf/pdf.c diff -u php4/ext/pdf/pdf.c:1.102 php4/ext/pdf/pdf.c:1.103 --- php4/ext/pdf/pdf.c:1.102 Thu Oct 11 19:33:39 2001 +++ php4/ext/pdf/pdf.c Thu Nov 8 18:37:33 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdf.c,v 1.102 2001/10/11 23:33:39 ssb Exp $ */ +/* $Id: pdf.c,v 1.103 2001/11/08 23:37:33 derick Exp $ */ /* pdflib 2.02 ... 3.0x is subject to the ALADDIN FREE PUBLIC LICENSE. Copyright (C) 1997-1999 Thomas Merz. 2000-2001 PDFlib GmbH */ @@ -52,8 +52,8 @@ #endif /* }}} */ -#if HAVE_PDFLIB - +#if HAVE_PDFLIB || HAVE_PDFLIB3 +#warning boo #include "php_pdf.h" static int le_pdf; @@ -347,7 +347,7 @@ #else php_info_print_table_row(2, "PDFlib GmbH Version", tmp ); #endif - php_info_print_table_row(2, "Revision", "$Revision: 1.102 $" ); + php_info_print_table_row(2, "Revision", "$Revision: 1.103 $" ); php_info_print_table_end(); } Index: php4/ext/pdf/php_pdf.h diff -u php4/ext/pdf/php_pdf.h:1.20 php4/ext/pdf/php_pdf.h:1.21 --- php4/ext/pdf/php_pdf.h:1.20 Tue Aug 21 09:33:15 2001 +++ php4/ext/pdf/php_pdf.h Thu Nov 8 18:37:33 2001 @@ -16,12 +16,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pdf.h,v 1.20 2001/08/21 13:33:15 uw Exp $ */ +/* $Id: php_pdf.h,v 1.21 2001/11/08 23:37:33 derick Exp $ */ #ifndef PHP_PDF_H #define PHP_PDF_H -#if HAVE_PDFLIB +#if HAVE_PDFLIB || HAVE_PDFLIB3 /* with version 2.20 of pdflib PDF_open_mem isn't available unless the following define isn't there.