Fix build error after last push with --with-debug=full due to SAFEMALLOC now being
defined in my_config.h (as opposed to in CFLAGS before.) mysys/my_malloc.c: Need to include my_global.h before messing with SAFEMALLOC, as now that macro may be re-defined in my_config.h, which is included from my_global.h mysys/my_once.c: Need to include my_global.h before messing with SAFEMALLOC, as now that macro may be re-defined in my_config.h, which is included from my_global.h mysys/my_realloc.c: Need to include my_global.h before messing with SAFEMALLOC, as now that macro may be re-defined in my_config.h, which is included from my_global.h
This commit is contained in:
parent
032ef1fa07
commit
6120cc96c9
@ -13,6 +13,9 @@
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
||||
|
||||
/* my_global.h may define SAFEMALLOC (through my_config.h). */
|
||||
#include <my_global.h>
|
||||
|
||||
#ifdef SAFEMALLOC /* We don't need SAFEMALLOC here */
|
||||
#undef SAFEMALLOC
|
||||
#endif
|
||||
|
@ -15,6 +15,9 @@
|
||||
|
||||
/* Not MT-SAFE */
|
||||
|
||||
/* my_global.h may define SAFEMALLOC (through my_config.h). */
|
||||
#include <my_global.h>
|
||||
|
||||
#ifdef SAFEMALLOC /* We don't need SAFEMALLOC here */
|
||||
#undef SAFEMALLOC
|
||||
#endif
|
||||
|
@ -13,6 +13,9 @@
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
||||
|
||||
/* my_global.h may define SAFEMALLOC (through my_config.h). */
|
||||
#include <my_global.h>
|
||||
|
||||
#ifdef SAFEMALLOC /* We don't need SAFEMALLOC here */
|
||||
#undef SAFEMALLOC
|
||||
#endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user