cvs: php4 /ext/recode/ config.m4 php_recode.h recode.c

thies Tue Jun 6 07:13:36 2000 EDT Modified files: /php4/ext/recode config.m4 php_recode.h recode.c Log: add check for stdbool.h Index: php4/ext/recode/config.m4 diff -u php4/ext/recode/config.m4:1.3 php4/ext/recode/config.m4:1.4 --- php4/ext/recode/config.m4:1.3 Tue May 23 16:30:38 2000 +++ php4/ext/recode/config.m4 Tue Jun 6 07:13:35 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.3 2000/05/23 23:30:38 sas Exp $ +dnl $Id: config.m4,v 1.4 2000/06/06 14:13:35 thies Exp $ dnl config.m4 for extension recode dnl don't forget to call PHP_EXTENSION(recode) @@ -58,5 +58,8 @@ fi AC_DEFINE(HAVE_LIBRECODE, 1, [Whether we have librecode 3.5 or higher]) + + AC_CHECK_HEADERS(stdbool.h) + PHP_EXTENSION(recode,$ext_shared) fi Index: php4/ext/recode/php_recode.h diff -u php4/ext/recode/php_recode.h:1.2 php4/ext/recode/php_recode.h:1.3 --- php4/ext/recode/php_recode.h:1.2 Thu May 18 08:34:33 2000 +++ php4/ext/recode/php_recode.h Tue Jun 6 07:13:35 2000 @@ -17,7 +17,7 @@ */ -/* $Id: php_recode.h,v 1.2 2000/05/18 15:34:33 zeev Exp $ */ +/* $Id: php_recode.h,v 1.3 2000/06/06 14:13:35 thies Exp $ */ #ifndef _PHP_RECODE_H #define _PHP_RECODE_H @@ -45,7 +45,12 @@ */ #define HAVE_BROKEN_RECODE -#include <stdbool.h> +#ifdef HAVE_STDBOOL_H +# include <stdbool.h> +#else + typedef enum {false = 0, true = 1} bool; +#endif + #include <sys/types.h> #include <stdio.h> #include <recode.h> Index: php4/ext/recode/recode.c diff -u php4/ext/recode/recode.c:1.9 php4/ext/recode/recode.c:1.10 --- php4/ext/recode/recode.c:1.9 Tue Jun 6 06:49:41 2000 +++ php4/ext/recode/recode.c Tue Jun 6 07:13:35 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: recode.c,v 1.9 2000/06/06 13:49:41 thies Exp $ */ +/* $Id: recode.c,v 1.10 2000/06/06 14:13:35 thies Exp $ */ /* {{{ includes & prototypes */ @@ -29,6 +29,7 @@ #include "ext/standard/php_string.h" #include "zend_list.h" + #ifdef HAVE_BROKEN_RECODE extern char *program_name; char *program_name = "php"; @@ -96,7 +97,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "Recode Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.9 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.10 $"); php_info_print_table_end(); } @@ -110,7 +111,7 @@ char *r = NULL; pval **str; pval **req; - int success; + bool success; ReSLS_FETCH(); if (ZEND_NUM_ARGS() != 2