Commit bcbde582 authored by lenz@mysql.com's avatar lenz@mysql.com
Browse files

Merge lgrimmer@work.mysql.com:/home/bk/mysql-4.0 

into mysql.com:/my/mysql-4.0
parents c040c7ef c6cc1129

include/my_sys.h

+3 −1
Original line number Diff line number Diff line
@@ -164,8 +164,10 @@ extern my_string my_strdup(const char *from,myf MyFlags); 
#undef  alloca

#define alloca(size)   __builtin_alloca (size)

#else /* xlc */

#ifdef _AIX

 #pragma alloca

#endif /* GCC.  */

#endif /* _AIX */

#endif /* __GNUC__  */

#define my_alloca(SZ) alloca((size_t) (SZ))

#define my_afree(PTR) {}

#else