diff options
| author | Johannes Schlüter <johannes@php.net> | 2013-07-23 12:50:37 +0200 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2013-07-23 12:50:37 +0200 |
| commit | c28ab73d7346e332594c30a9a544cfd74b8bc5bb (patch) | |
| tree | a59d99769a47532a51aff8acab325b0b5143366f /ext/pdo_mysql | |
| parent | 9b6aa268a3ab431b7dcd592b922dbc399202e58d (diff) | |
| download | php-git-c28ab73d7346e332594c30a9a544cfd74b8bc5bb.tar.gz | |
Fix compiler warning on redefined constant
Diffstat (limited to 'ext/pdo_mysql')
| -rw-r--r-- | ext/pdo_mysql/mysql_driver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index a703f93e7c..32d13bafaf 100644 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -527,9 +527,9 @@ static struct pdo_dbh_methods mysql_methods = { /* }}} */ #ifdef PHP_WIN32 -# define MYSQL_UNIX_ADDR NULL +# define PDO_DEFAULT_MYSQL_UNIX_ADDR NULL #else -# define MYSQL_UNIX_ADDR PDO_MYSQL_G(default_socket) +# define PDO_DEFAULT_MYSQL_UNIX_ADDR PDO_MYSQL_G(default_socket) #endif /* {{{ pdo_mysql_handle_factory */ @@ -545,7 +545,7 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_ { "dbname", "", 0 }, { "host", "localhost", 0 }, { "port", "3306", 0 }, - { "unix_socket", MYSQL_UNIX_ADDR, 0 }, + { "unix_socket", PDO_DEFAULT_MYSQL_UNIX_ADDR, 0 }, }; int connect_opts = 0 #ifdef CLIENT_MULTI_RESULTS |