Fix compiler warnings in ext/mysql, ext/mysqli and ext/pdo_mysql

This commit is contained in:
Kalle Sommer Nielsen 2009-05-20 08:29:23 +00:00
parent f1fd8628a0
commit b3e899e7ca
5 changed files with 31 additions and 27 deletions

View file

@ -625,7 +625,9 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
int hashed_details_length, port = MYSQL_PORT;
long client_flags = 0;
php_mysql_conn *mysql=NULL;
#if !defined(MYSQL_USE_MYSQLND) && !defined(MYSQL_HASH_SET_CHARSET)
char *encoding;
#endif
#if MYSQL_VERSION_ID <= 32230
void (*handler) (int);
#endif
@ -1185,7 +1187,7 @@ PHP_FUNCTION(mysql_thread_id)
}
ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id, "MySQL-Link", le_link, le_plink);
RETURN_LONG(mysql_thread_id(mysql->conn));
RETURN_LONG((long) mysql_thread_id(mysql->conn));
}
/* }}} */