CVS update: php3/functions
| From: | rasmus | Date: | Sun, 28 Feb 1999 17:25:57 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-4367@lists.php.net to get a copy of this message | ||
Date: Sunday February 28, 1999 @ 12:25
Author: rasmus
Update of /repository/php3/functions
In directory asf:/u/temp/cvs-serv29978/functions
Modified Files:
magick.c reg.c
Log Message:
Indicate whether we are using bundled or system regex in info function
for the regex module and add compile options to the ImageMagick info
function
Index: php3/functions/magick.c
diff -c php3/functions/magick.c:1.6 php3/functions/magick.c:1.7
*** php3/functions/magick.c:1.6 Sun Feb 28 11:56:22 1999
--- php3/functions/magick.c Sun Feb 28 12:25:57 1999
***************
*** 28,34 ****
+----------------------------------------------------------------------+
*/
! /* $Id: magick.c,v 1.6 1999/02/28 16:56:22 rasmus Exp $ */
/* TODO list:
*
--- 28,34 ----
+----------------------------------------------------------------------+
*/
! /* $Id: magick.c,v 1.7 1999/02/28 17:25:57 rasmus Exp $ */
/* TODO list:
*
***************
*** 282,287 ****
--- 282,294 ----
PUTS(MagickVersion);
PUTS("<BR>\n");
PUTS(MagickCopyright);
+ PUTS("<br>RCS Version: $Id: magick.c,v 1.7 1999/02/28 17:25:57 rasmus Exp
$<br>\n");
+ php3_printf("<b>Compile
Options</b><br><tt>IMAGICK_INCLUDE=%s<br>\n"
+ "IMAGICK_LFLAGS=%s<br>\n"
+ "IMAGICK_LIBS=%s<br></tt>\n",
+ PHP_IMAGICK_INCLUDE,
+ PHP_IMAGICK_LFLAGS,
+ PHP_IMAGICK_LIBS);
#endif
}
/* }}} */
Index: php3/functions/reg.c
diff -c php3/functions/reg.c:1.97 php3/functions/reg.c:1.98
*** php3/functions/reg.c:1.97 Mon Jan 4 12:28:16 1999
--- php3/functions/reg.c Sun Feb 28 12:25:57 1999
***************
*** 28,34 ****
| Jaakko Hyvätti <jaakko@hyvatti.iki.fi> |
+----------------------------------------------------------------------+
*/
! /* $Id: reg.c,v 1.97 1999/01/04 17:28:16 fmk Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
--- 28,34 ----
| Jaakko Hyvätti <jaakko@hyvatti.iki.fi> |
+----------------------------------------------------------------------+
*/
! /* $Id: reg.c,v 1.98 1999/02/28 17:25:57 rasmus Exp $ */
#ifdef THREAD_SAFE
#include "tls.h"
#endif
***************
*** 54,62 ****
static int php3_minit_regex(INIT_FUNC_ARGS);
static int php3_mshutdown_regex(void);
php3_module_entry regexp_module_entry = {
! "Regular Expressions", reg_functions, php3_minit_regex, php3_mshutdown_regex, NULL,
NULL, NULL, STANDARD_MODULE_PROPERTIES
};
/* This is the maximum number of (..) constructs we'll generate from a
--- 54,63 ----
static int php3_minit_regex(INIT_FUNC_ARGS);
static int php3_mshutdown_regex(void);
+ static void php3_info_regex(void);
php3_module_entry regexp_module_entry = {
! "Regular Expressions", reg_functions, php3_minit_regex, php3_mshutdown_regex, NULL,
NULL, php3_info_regex, STANDARD_MODULE_PROPERTIES
};
/* This is the maximum number of (..) constructs we'll generate from a
***************
*** 72,77 ****
--- 73,86 ----
} reg_cache;
static HashTable ht_rc;
+
+ static void php3_info_regex(void) {
+ #if HSREGEX
+ PUTS("Bundled regex library enabled\n");
+ #else
+ PUTS("System regex library enabled\n");
+ #endif
+ }
static int _php3_regcomp(regex_t *preg, const char *pattern, int cflags)
{
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net