diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-03-24 12:30:03 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-03-24 12:30:03 +0100 |
| commit | 8250ceced6aab95347e00e2ff1c02730da0be4fe (patch) | |
| tree | a9c92cf8c685457bf79b580ab6109e6331e8c300 /include | |
| parent | a85ccfedcf91f7ad2c578ec60e69d127f199d079 (diff) | |
| download | mariadb-git-8250ceced6aab95347e00e2ff1c02730da0be4fe.tar.gz | |
Fix compilation on Windows:
- Fixes for type-conversion
(time_t is not interchangeable with my_time_t on Windows as time_t s 64 bit while my_time_t is long)
- BIGENDIAN-> ARCH_BIGENDIAN .
BIGENDIAN constant is defined in winsock2.h (as 0)
- added explicit cast for longlong->double conversion in sql/item.h (fixed many warnings)
Also, HAVE_SNPRINTF is now defined and snprintf is defined to _snprintf in config-win.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 7 | ||||
| -rw-r--r-- | include/my_sys.h | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/include/config-win.h b/include/config-win.h index da9b1fc00c3..84bc4ece959 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -293,10 +293,9 @@ inline ulonglong double2ulonglong(double d) #define FILE_SHARE_DELETE 0 /* Not implemented on Win 98/ME */ #endif -#ifdef NOT_USED -#define HAVE_SNPRINTF /* Gave link error */ -#define _snprintf snprintf -#endif + +#define HAVE_SNPRINTF +#define snprintf _snprintf #ifdef _MSC_VER #define HAVE_LDIV /* The optimizer breaks in zortech for ldiv */ diff --git a/include/my_sys.h b/include/my_sys.h index f86b7839baf..0d57566d6e4 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -902,7 +902,7 @@ void my_diff_and_hrtime(my_timediff_t *interval, my_hrtime_t *timestamp); extern ulonglong my_getsystime(void); #define my_micro_time() (my_getsystime()/10) -#define hrtime_to_time(X) ((time_t)((X).val/1000000)) +#define hrtime_to_time(X) ((my_time_t)((X).val/1000000)) #define hrtime_from_time(X) ((ulonglong)((X)*1000000ULL)) #define hrtime_to_double(X) ((X).val/1e6) #define hrtime_sec_part(X) ((X).val%1000000) |