andrey Mon, 25 Oct 2010 13:44:11 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=304846
Log:
rename and remove usage of inttypes.h, not needed
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h
U php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c 2010-10-25
13:43:03 UTC (rev 304845)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c 2010-10-25
13:44:11 UTC (rev 304846)
@@ -27,7 +27,6 @@
#include "mysqlnd_wireprotocol.h"
#include "mysqlnd_statistics.h"
#include "zend_builtin_functions.h"
-#include "inttypes.h"
static const char * const mysqlnd_debug_default_trace_file =
"/tmp/mysqlnd.trace";
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-25
13:43:03 UTC (rev 304845)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.h 2010-10-25
13:44:11 UTC (rev 304846)
@@ -66,9 +66,9 @@
#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 __tp = {0};
uint64_t __start = 0; /* initialization is needed */
-#define DBG_PROFILE_START_TIME() gettimeofday(&__tp,
NULL); __start = DBG_PROFILE_TIMEVAL_TO_DOUBLE(__tp);
-#define DBG_PROFILE_END_TIME(duration) gettimeofday(&__tp, NULL);
(duration) = (DBG_PROFILE_TIMEVAL_TO_DOUBLE(__tp) - __start);
+#define DBG_PROFILE_DECLARE_TIMEVARS struct timeval __dbg_prof_tp = {0};
uint64_t __dbg_prof_start = 0; /* initialization is needed */
+#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);
#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)
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c 2010-10-25 13:43:03 UTC
(rev 304845)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c 2010-10-25 13:44:11 UTC
(rev 304846)
@@ -27,7 +27,6 @@
#include "mysqlnd_wireprotocol.h"
#include "mysqlnd_statistics.h"
#include "zend_builtin_functions.h"
-#include "inttypes.h"
static const char * const mysqlnd_debug_default_trace_file =
"/tmp/mysqlnd.trace";
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h 2010-10-25 13:43:03 UTC
(rev 304845)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.h 2010-10-25 13:44:11 UTC
(rev 304846)
@@ -66,9 +66,9 @@
#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 __tp = {0};
uint64_t __start = 0; /* initialization is needed */
-#define DBG_PROFILE_START_TIME() gettimeofday(&__tp,
NULL); __start = DBG_PROFILE_TIMEVAL_TO_DOUBLE(__tp);
-#define DBG_PROFILE_END_TIME(duration) gettimeofday(&__tp, NULL);
(duration) = (DBG_PROFILE_TIMEVAL_TO_DOUBLE(__tp) - __start);
+#define DBG_PROFILE_DECLARE_TIMEVARS struct timeval __dbg_prof_tp = {0};
uint64_t __dbg_prof_start = 0; /* initialization is needed */
+#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);
#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)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
