summaryrefslogtreecommitdiff
path: root/include/my_time.h
diff options
context:
space:
mode:
authorunknown <msvensson@pilot.blaudden>2007-02-23 17:59:07 +0100
committerunknown <msvensson@pilot.blaudden>2007-02-23 17:59:07 +0100
commit7f723d5326d16f5651aae4d2962d7231d6dade6c (patch)
tree2de3384084d871d610a4de43009defa36e869d09 /include/my_time.h
parent7020d1920a2c13659ec4b8492054c154427e6f31 (diff)
downloadmariadb-git-7f723d5326d16f5651aae4d2962d7231d6dade6c.tar.gz
Bug#26536 func_time failure on vm-win2003-64-b, occurs every time
- Fixes for 5.1 - Always use long for my_time_t include/my_time.h: Use long for my_time_t It should be signed and hold seconds for 1902 -- 2038-01-19 range i.e at least a 32bit variable Using the system built in time_t is not an option as we rely on the above requirements in the time functions For example QNX has an unsigned time_t type
Diffstat (limited to 'include/my_time.h')
-rw-r--r--include/my_time.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/include/my_time.h b/include/my_time.h
index 88abe02ac08..d96c5822069 100644
--- a/include/my_time.h
+++ b/include/my_time.h
@@ -38,13 +38,7 @@ extern uchar days_in_month[];
For example QNX has an unsigned time_t type
*/
-#if defined(_WIN64) || defined(WIN64)
-/* on Win64 long is still 4 bytes (not 8!) */
-typedef LONG64 my_time_t;
-#else
-typedef time_t my_time_t;
-
-#endif
+typedef long my_time_t;
#define MY_TIME_T_MAX LONG_MAX
#define MY_TIME_T_MIN LONG_MIN