diff options
author | unknown <paul@ice.snake.net> | 2004-03-05 11:16:06 -0600 |
---|---|---|
committer | unknown <paul@ice.snake.net> | 2004-03-05 11:16:06 -0600 |
commit | 50263c99f4525306d19ca0cb7275f5493234d564 (patch) | |
tree | e93060c3f85c551b777952f2836d2923d1301989 /include | |
parent | e3af1fab8c2932ec02861cee5b06d0ad51c45cad (diff) | |
parent | 1c60073e14f76ca1bb0fc0173c6db14092086488 (diff) | |
download | mariadb-git-50263c99f4525306d19ca0cb7275f5493234d564.tar.gz |
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
Diffstat (limited to 'include')
-rw-r--r-- | include/my_global.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index a8078f579ee..2a82173979d 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -692,7 +692,7 @@ typedef long long my_ptrdiff_t; #define ALIGN_SIZE(A) MY_ALIGN((A),sizeof(double)) /* Size to make adressable obj. */ #define ALIGN_PTR(A, t) ((t*) MY_ALIGN((A),sizeof(t))) - /* Offset of filed f in structure t */ + /* Offset of field f in structure t */ #define OFFSET(t, f) ((size_t)(char *)&((t *)0)->f) #define ADD_TO_PTR(ptr,size,type) (type) ((byte*) (ptr)+size) #define PTR_BYTE_DIFF(A,B) (my_ptrdiff_t) ((byte*) (A) - (byte*) (B)) |