diff options
| author | unknown <reggie@big_geek.> | 2006-05-08 15:15:05 -0500 |
|---|---|---|
| committer | unknown <reggie@big_geek.> | 2006-05-08 15:15:05 -0500 |
| commit | 4f908f248e148fc015f3f82450a003b88bdca98d (patch) | |
| tree | 45e25c571bea2101f73fff090266209606f600ae /include/my_sys.h | |
| parent | 94c6f6dc4888166b3677f38b534502156ef50d49 (diff) | |
| parent | ec82432941f7f6ef3d60b8d578883633dcaa6f26 (diff) | |
| download | mariadb-git-4f908f248e148fc015f3f82450a003b88bdca98d.tar.gz | |
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into big_geek.:C:/Work/mysql/mysql-5.1
include/config-win.h:
Auto merged
include/m_string.h:
Auto merged
include/my_base.h:
Auto merged
include/my_sys.h:
Auto merged
include/my_tree.h:
Auto merged
mysys/mf_keycache.c:
Auto merged
mysys/my_init.c:
Auto merged
mysys/my_open.c:
Auto merged
mysys/my_access.c:
adjusted defines from merge
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 1540d820777..78e7bee88c6 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -196,22 +196,6 @@ extern void my_large_free(gptr ptr, myf my_flags); #define my_afree(PTR) my_free(PTR,MYF(MY_WME)) #endif /* HAVE_ALLOCA */ -#ifdef MSDOS -#ifdef __ZTC__ -void * __CDECL halloc(long count,size_t length); -void __CDECL hfree(void *ptr); -#endif -#if defined(USE_HALLOC) -#if defined(_VCM_) || defined(M_IC80386) -#undef USE_HALLOC -#endif -#endif -#ifdef USE_HALLOC -#define malloc(a) halloc((long) (a),1) -#define free(a) hfree(a) -#endif -#endif /* MSDOS */ - #ifndef errno /* did we already get it? */ #ifdef HAVE_ERRNO_AS_DEFINE #include <errno.h> /* errno is a define */ |