diff options
| author | Andrey Hristov <andrey@php.net> | 2008-10-31 20:32:17 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2008-10-31 20:32:17 +0000 |
| commit | 77c1e145e1b70a64caae504c58d78460201df4be (patch) | |
| tree | 11b265212bffd1240c7eb3f924f8caecb3aa402f /ext/mysqlnd/mysqlnd_statistics.h | |
| parent | 4f5895a4d2bb3f213dc58a3bced00a7a6f22a7ee (diff) | |
| download | php-git-77c1e145e1b70a64caae504c58d78460201df4be.tar.gz | |
MFB:
64bit fixes:
- fixes to sprintf modifiers, cleaning warnings
- use _t types, like uint64_t instead of uint64, thus skipping series of
typedefs.
Diffstat (limited to 'ext/mysqlnd/mysqlnd_statistics.h')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_statistics.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/ext/mysqlnd/mysqlnd_statistics.h b/ext/mysqlnd/mysqlnd_statistics.h index 1215a13681..32177e71ba 100644 --- a/ext/mysqlnd/mysqlnd_statistics.h +++ b/ext/mysqlnd/mysqlnd_statistics.h @@ -62,8 +62,8 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[]; #define MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(statistic1, value1, statistic2, value2) \ { \ if (MYSQLND_G(collect_statistics)) { \ - uint64 v1 = (uint64) (value1); \ - uint64 v2 = (uint64) (value2); \ + uint64_t v1 = (uint64_t) (value1); \ + uint64_t v2 = (uint64_t) (value2); \ DBG_INF_FMT("Global stat increase [%s] [%s]", mysqlnd_stats_values_names[statistic1], mysqlnd_stats_values_names[statistic2]); \ \ tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \ @@ -89,7 +89,7 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[]; #define MYSQLND_INC_CONN_STATISTIC_W_VALUE(conn_stats, statistic, value) \ { \ if (MYSQLND_G(collect_statistics) && statistic != STAT_LAST) { \ - uint64 v = (uint64) (value); \ + uint64_t v = (uint64_t) (value); \ DBG_INF_FMT("Global&Conn stat increase w value [%s]", mysqlnd_stats_values_names[statistic]); \ tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \ mysqlnd_global_stats->values[(statistic)] += v; \ @@ -103,8 +103,8 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[]; #define MYSQLND_INC_CONN_STATISTIC_W_VALUE2(conn_stats, statistic1, value1, statistic2, value2) \ { \ if (MYSQLND_G(collect_statistics)) { \ - uint64 v1 = (uint64) (value1); \ - uint64 v2 = (uint64) (value2); \ + uint64_t v1 = (uint64_t) (value1); \ + uint64_t v2 = (uint64_t) (value2); \ \ tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \ if (statistic1 != STAT_LAST) mysqlnd_global_stats->values[(statistic1)]+= v1; \ @@ -121,9 +121,9 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[]; #define MYSQLND_INC_CONN_STATISTIC_W_VALUE3(conn_stats, statistic1, value1, statistic2, value2, statistic3, value3) \ { \ if (MYSQLND_G(collect_statistics)) { \ - uint64 v1 = (uint64) (value1); \ - uint64 v2 = (uint64) (value2); \ - uint64 v3 = (uint64) (value3); \ + uint64_t v1 = (uint64_t) (value1); \ + uint64_t v2 = (uint64_t) (value2); \ + uint64_t v3 = (uint64_t) (value3); \ \ tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \ if (statistic1 != STAT_LAST) mysqlnd_global_stats->values[(statistic1)]+= v1; \ @@ -164,8 +164,8 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[]; #define MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(statistic1, value1, statistic2, value2) \ { \ if (MYSQLND_G(collect_statistics)) { \ - uint64 v1 = (uint64) (value1); \ - uint64 v2 = (uint64) (value2); \ + uint64_t v1 = (uint64_t) (value1); \ + uint64_t v2 = (uint64_t) (value2); \ DBG_INF_FMT("Global stat increase [%s] [%s]", mysqlnd_stats_values_names[statistic1], mysqlnd_stats_values_names[statistic2]); \ \ if (statistic1 != STAT_LAST) mysqlnd_global_stats->values[(statistic1)]+= v1; \ @@ -187,7 +187,7 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[]; #define MYSQLND_INC_CONN_STATISTIC_W_VALUE(conn_stats, statistic, value) \ { \ if (MYSQLND_G(collect_statistics) && statistic != STAT_LAST) { \ - uint64 v = (uint64) (value); \ + uint64_t v = (uint64_t) (value); \ DBG_INF_FMT("Global&Conn stats increase w value [%s]", mysqlnd_stats_values_names[statistic]); \ mysqlnd_global_stats->values[(statistic)] += v; \ if ((conn_stats)) { \ @@ -199,8 +199,8 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[]; #define MYSQLND_INC_CONN_STATISTIC_W_VALUE2(conn_stats, statistic1, value1, statistic2, value2) \ { \ if (MYSQLND_G(collect_statistics)) { \ - uint64 v1 = (uint64) (value1); \ - uint64 v2 = (uint64) (value2); \ + uint64_t v1 = (uint64_t) (value1); \ + uint64_t v2 = (uint64_t) (value2); \ \ if (statistic1 != STAT_LAST) mysqlnd_global_stats->values[(statistic1)]+= v1; \ if (statistic2 != STAT_LAST) mysqlnd_global_stats->values[(statistic2)]+= v2; \ @@ -214,9 +214,9 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[]; #define MYSQLND_INC_CONN_STATISTIC_W_VALUE3(conn_stats, statistic1, value1, statistic2, value2, statistic3, value3) \ { \ if (MYSQLND_G(collect_statistics)) { \ - uint64 v1 = (uint64) (value1); \ - uint64 v2 = (uint64) (value2); \ - uint64 v3 = (uint64) (value3); \ + uint64_t v1 = (uint64_t) (value1); \ + uint64_t v2 = (uint64_t) (value2); \ + uint64_t v3 = (uint64_t) (value3); \ \ if (statistic1 != STAT_LAST) mysqlnd_global_stats->values[(statistic1)]+= v1; \ if (statistic2 != STAT_LAST) mysqlnd_global_stats->values[(statistic2)]+= v2; \ |