andrey Thu, 28 Oct 2010 13:46:54 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=304973
Log:
fix windows debug build
better zlib detection
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h
U php/php-src/trunk/ext/mysqlnd/config9.m4
U php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 2010-10-28 13:09:07 UTC
(rev 304972)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/config9.m4 2010-10-28 13:46:54 UTC
(rev 304973)
@@ -27,13 +27,10 @@
dnl Windows uses config.w32 thus this code is safe for now
if test "$PHP_MYSQLND_COMPRESSION_SUPPORT" != "no"; then
- AC_DEFINE([MYSQLND_COMPRESSION_ENABLED], 1, [Enable compressed protocol
support])
- if test "$PHP_ZLIB_DIR" != "no"; then
+ if test -z "$PHP_ZLIB_DIR"; then
+ AC_DEFINE([MYSQLND_COMPRESSION_ENABLED], 1, [Enable compressed protocol
support])
PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR, MYSQLND_SHARED_LIBADD)
MYSQLND_LIBS="$MYSQLND_LIBS -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz"
- else
- PHP_ADD_LIBRARY(z,, MYSQLND_SHARED_LIBADD)
- MYSQLND_LIBS="$MYSQLND_LIBS -lz"
fi
fi
AC_DEFINE([MYSQLND_SSL_SUPPORTED], 1, [Enable SSL support])
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h 2010-10-28
13:09:07 UTC (rev 304972)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h 2010-10-28
13:46:54 UTC (rev 304973)
@@ -66,16 +66,21 @@
#if defined(__GNUC__) || (defined(_MSC_VER) && (_MSC_VER >= 1400))
#define DBG_PROFILE_TIMEVAL_TO_DOUBLE(tp) ((tp.tv_sec * 1000000LL)+
tp.tv_usec)
-#define DBG_PROFILE_DECLARE_TIMEVARS struct timeval __dbg_prof_tp = {0};
uint64_t __dbg_prof_start = 0; /* initialization is needed */
+#ifndef _MSC_VER
#define DBG_PROFILE_START_TIME() gettimeofday(&__dbg_prof_tp,
NULL); __dbg_prof_start = DBG_PROFILE_TIMEVAL_TO_DOUBLE(__dbg_prof_tp);
#define DBG_PROFILE_END_TIME(duration) gettimeofday(&__dbg_prof_tp, NULL);
(duration) = (DBG_PROFILE_TIMEVAL_TO_DOUBLE(__dbg_prof_tp) - __dbg_prof_start);
+#else
+#define DBG_PROFILE_START_TIME() __dbg_prof_start = 0; /* no
gettimeofday on Windows */
+#define DBG_PROFILE_END_TIME(duration) (duration) = 0; /* no gettimeofday on
Windows */
+#endif
+
#define DBG_INF_EX(dbg_obj, msg) do { if (dbg_skip_trace ==
FALSE) (dbg_obj)->m->log((dbg_obj), __LINE__, __FILE__, -1, "info : ", (msg));
} while (0)
#define DBG_ERR_EX(dbg_obj, msg) do { if (dbg_skip_trace ==
FALSE) (dbg_obj)->m->log((dbg_obj), __LINE__, __FILE__, -1, "error: ", (msg));
} while (0)
#define DBG_INF_FMT_EX(dbg_obj, ...) do { if (dbg_skip_trace == FALSE)
(dbg_obj)->m->log_va((dbg_obj), __LINE__, __FILE__, -1, "info : ",
__VA_ARGS__); } while (0)
#define DBG_ERR_FMT_EX(dbg_obj, ...) do { if (dbg_skip_trace == FALSE)
(dbg_obj)->m->log_va((dbg_obj), __LINE__, __FILE__, -1, "error: ",
__VA_ARGS__); } while (0)
-#define DBG_ENTER_EX(dbg_obj, func_name) DBG_PROFILE_DECLARE_TIMEVARS;
zend_bool dbg_skip_trace = TRUE; \
+#define DBG_ENTER_EX(dbg_obj, func_name) struct timeval __dbg_prof_tp = {0};
uint64_t __dbg_prof_start = 0; /* initialization is needed */zend_bool
dbg_skip_trace = TRUE; \
if ((dbg_obj)) dbg_skip_trace =
!(dbg_obj)->m->func_enter((dbg_obj), __LINE__, __FILE__, func_name,
strlen(func_name)); \
do { DBG_PROFILE_START_TIME(); } while
(0);
#define DBG_RETURN_EX(dbg_obj, value) \
Modified: php/php-src/trunk/ext/mysqlnd/config9.m4
===================================================================
--- php/php-src/trunk/ext/mysqlnd/config9.m4 2010-10-28 13:09:07 UTC (rev
304972)
+++ php/php-src/trunk/ext/mysqlnd/config9.m4 2010-10-28 13:46:54 UTC (rev
304973)
@@ -27,13 +27,10 @@
dnl Windows uses config.w32 thus this code is safe for now
if test "$PHP_MYSQLND_COMPRESSION_SUPPORT" != "no"; then
- AC_DEFINE([MYSQLND_COMPRESSION_ENABLED], 1, [Enable compressed protocol
support])
- if test "$PHP_ZLIB_DIR" != "no"; then
+ if test -z "$PHP_ZLIB_DIR"; then
+ AC_DEFINE([MYSQLND_COMPRESSION_ENABLED], 1, [Enable compressed protocol
support])
PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR, MYSQLND_SHARED_LIBADD)
MYSQLND_LIBS="$MYSQLND_LIBS -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz"
- else
- PHP_ADD_LIBRARY(z,, MYSQLND_SHARED_LIBADD)
- MYSQLND_LIBS="$MYSQLND_LIBS -lz"
fi
fi
AC_DEFINE([MYSQLND_SSL_SUPPORTED], 1, [Enable SSL support])
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h 2010-10-28 13:09:07 UTC
(rev 304972)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h 2010-10-28 13:46:54 UTC
(rev 304973)
@@ -66,16 +66,21 @@
#if defined(__GNUC__) || (defined(_MSC_VER) && (_MSC_VER >= 1400))
#define DBG_PROFILE_TIMEVAL_TO_DOUBLE(tp) ((tp.tv_sec * 1000000LL)+
tp.tv_usec)
-#define DBG_PROFILE_DECLARE_TIMEVARS struct timeval __dbg_prof_tp = {0};
uint64_t __dbg_prof_start = 0; /* initialization is needed */
+#ifndef _MSC_VER
#define DBG_PROFILE_START_TIME() gettimeofday(&__dbg_prof_tp,
NULL); __dbg_prof_start = DBG_PROFILE_TIMEVAL_TO_DOUBLE(__dbg_prof_tp);
#define DBG_PROFILE_END_TIME(duration) gettimeofday(&__dbg_prof_tp, NULL);
(duration) = (DBG_PROFILE_TIMEVAL_TO_DOUBLE(__dbg_prof_tp) - __dbg_prof_start);
+#else
+#define DBG_PROFILE_START_TIME() __dbg_prof_start = 0; /* no
gettimeofday on Windows */
+#define DBG_PROFILE_END_TIME(duration) (duration) = 0; /* no gettimeofday on
Windows */
+#endif
+
#define DBG_INF_EX(dbg_obj, msg) do { if (dbg_skip_trace ==
FALSE) (dbg_obj)->m->log((dbg_obj), __LINE__, __FILE__, -1, "info : ", (msg));
} while (0)
#define DBG_ERR_EX(dbg_obj, msg) do { if (dbg_skip_trace ==
FALSE) (dbg_obj)->m->log((dbg_obj), __LINE__, __FILE__, -1, "error: ", (msg));
} while (0)
#define DBG_INF_FMT_EX(dbg_obj, ...) do { if (dbg_skip_trace == FALSE)
(dbg_obj)->m->log_va((dbg_obj), __LINE__, __FILE__, -1, "info : ",
__VA_ARGS__); } while (0)
#define DBG_ERR_FMT_EX(dbg_obj, ...) do { if (dbg_skip_trace == FALSE)
(dbg_obj)->m->log_va((dbg_obj), __LINE__, __FILE__, -1, "error: ",
__VA_ARGS__); } while (0)
-#define DBG_ENTER_EX(dbg_obj, func_name) DBG_PROFILE_DECLARE_TIMEVARS;
zend_bool dbg_skip_trace = TRUE; \
+#define DBG_ENTER_EX(dbg_obj, func_name) struct timeval __dbg_prof_tp = {0};
uint64_t __dbg_prof_start = 0; /* initialization is needed */zend_bool
dbg_skip_trace = TRUE; \
if ((dbg_obj)) dbg_skip_trace =
!(dbg_obj)->m->func_enter((dbg_obj), __LINE__, __FILE__, func_name,
strlen(func_name)); \
do { DBG_PROFILE_START_TIME(); } while
(0);
#define DBG_RETURN_EX(dbg_obj, value) \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
