Changeset 625 for branches/1.3/coverager.c

Timestamp:

07/05/2009 11:01:49 AM (4 years ago)

Author:

moo

Message:

merged r541:559 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• coverager.c (modified) (4 diffs)

branches/1.3/coverager.c

@@ +1 @@
+#if 0
+#define XCACHE_DEBUG
+#endif
+
 #include <stdio.h>
 #include "xcache.h"
@@ -18 +22 @@
 static char *xc_coveragedump_dir = NULL;
 static zend_compile_file_t *old_compile_file = NULL;
-
-#if 0
-#define DEBUG
-#endif
 
 /* dumper */
@@ -246 +246 @@
     if (XG(coverager)) {
         xc_coverager_enable(TSRMLS_C);
+#ifdef ZEND_COMPILE_EXTENDED_INFO
+        CG(compiler_options) |= ZEND_COMPILE_EXTENDED_INFO;
+#else
         CG(extended_info) = 1;
+#endif
     }
     else {
@@ -470 +474 @@
 
     if (cfg_get_string("xcache.coveragedump_directory", &xc_coveragedump_dir) == SUCCESS && xc_coveragedump_dir) {
+        int len;
         xc_coveragedump_dir = pestrdup(xc_coveragedump_dir, 1);
-        int len = strlen(xc_coveragedump_dir);
+        len = strlen(xc_coveragedump_dir);
         if (len) {
             if (xc_coveragedump_dir[len - 1] == '/') {