maria-developers team mailing list archive

[knielsen@xxxxxxxxxxxxxxx]

#At lp:maria

 2689 knielsen@xxxxxxxxxxxxxxx	2009-03-31
      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.)
      modified:
        mysys/my_malloc.c
        mysys/my_once.c
        mysys/my_realloc.c

per-file messages:
  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
=== modified file 'mysys/my_malloc.c'
--- a/mysys/my_malloc.c	2007-10-02 07:32:33 +0000
+++ b/mysys/my_malloc.c	2009-03-31 08:06:51 +0000
@@ -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

=== modified file 'mysys/my_once.c'
--- a/mysys/my_once.c	2007-05-10 09:59:39 +0000
+++ b/mysys/my_once.c	2009-03-31 08:06:51 +0000
@@ -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

=== modified file 'mysys/my_realloc.c'
--- a/mysys/my_realloc.c	2008-04-28 16:24:05 +0000
+++ b/mysys/my_realloc.c	2009-03-31 08:06:51 +0000
@@ -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