diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-10-29 23:54:37 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-10-29 23:54:37 +0200 |
| commit | 60d46b90867e9712c70d9e582784b335fbeb2e67 (patch) | |
| tree | 7459abcf2b29e1c59d1ecb93ef0a42fdc01adbfb /include | |
| parent | 2d9a473bb67eb5d46ef3facf9384e2b9a621b79e (diff) | |
| parent | 31ba88c0c17e7a3eca365f104e2f129af7f07ee5 (diff) | |
| download | mariadb-git-60d46b90867e9712c70d9e582784b335fbeb2e67.tar.gz | |
merge
include/my_global.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index 3f018ab73cb..5a8e3b2cba7 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -119,7 +119,16 @@ #define _H_STRINGS #define _SYS_STREAM_H /* #define _AIX32_CURSES */ /* XXX: this breaks AIX 4.3.3 (others?). */ +#define ulonglong2double(A) my_ulonglong2double(A) +#define my_off_t2double(A) my_ulonglong2double(A) +#ifdef __cplusplus +extern "C" { #endif +double my_ulonglong2double(unsigned long long A); +#ifdef __cplusplus +} +#endif +#endif /* _AIX */ #ifdef HAVE_BROKEN_SNPRINTF /* HPUX 10.20 don't have this defined */ #undef HAVE_SNPRINTF |