From 8b8cd15428b5db4aedd81d4133b1aa646ccf527a Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Tue, 23 Oct 2007 10:10:18 +0000 Subject: [PATCH] Fix build failure on Windows. Seems "free" can't be used even as method name of a structure. The MS compiler (the preprocessor most probably) changes it to _free_dbg --- ext/mysqlnd/mysqlnd.c | 2 +- ext/mysqlnd/mysqlnd_debug.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 98b3ab7dc93..5d4e3c59887 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -2032,7 +2032,7 @@ static PHP_RSHUTDOWN_FUNCTION(mysqlnd) DBG_ENTER("RSHUTDOWN"); if (dbg) { dbg->m->close(dbg); - dbg->m->free(dbg); + dbg->m->free_handle(dbg); MYSQLND_G(dbg) = NULL; } #endif diff --git a/ext/mysqlnd/mysqlnd_debug.h b/ext/mysqlnd/mysqlnd_debug.h index 120d74aaa56..43bb634c930 100644 --- a/ext/mysqlnd/mysqlnd_debug.h +++ b/ext/mysqlnd/mysqlnd_debug.h @@ -39,7 +39,7 @@ struct st_mysqlnd_debug_methods char * func_name, uint func_name_len); enum_func_status (*func_leave)(MYSQLND_DEBUG *self, unsigned int line, const char * const file); enum_func_status (*close)(MYSQLND_DEBUG *self); - enum_func_status (*free)(MYSQLND_DEBUG *self); + enum_func_status (*free_handle)(MYSQLND_DEBUG *self); }; struct st_mysqlnd_debug