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/m_string.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/m_string.h')
| -rw-r--r-- | include/m_string.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/m_string.h b/include/m_string.h index e73f5c11487..ce34c303c22 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -106,12 +106,6 @@ extern char NEAR _dig_vec_lower[]; #define memcpy_fixed(A,B,C) memcpy((A),(B),(C)) #endif -#ifdef MSDOS -#undef bmove_align -#define bmove512(A,B,C) bmove_align(A,B,C) -extern void bmove_align(gptr dst,const gptr src,uint len); -#endif - #if (!defined(USE_BMOVE512) || defined(HAVE_purify)) && !defined(bmove512) #define bmove512(A,B,C) memcpy(A,B,C) #endif |