diff options
| author | unknown <konstantin@mysql.com> | 2004-08-05 14:16:43 -0700 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2004-08-05 14:16:43 -0700 |
| commit | 9919574acfe36f2841dae33c729367658cc84078 (patch) | |
| tree | 9397442b1136ff001e87120f0c52fde79df7dbc5 /include | |
| parent | 61528cf2d8ecb68e6c10f50e06678043db668565 (diff) | |
| download | mariadb-git-9919574acfe36f2841dae33c729367658cc84078.tar.gz | |
Cleanup in mysql_time.h/my_time.h headers. The first is used in mysql.h,
the second is for the rest of time declarations in mysys.
include/my_time.h:
New declarations moved from mysql_time.h
include/mysql_time.h:
New declarations moved to my_time.h.
sql/tztime.cc:
Enforcing Monty's approach to header files.
sql/tztime.h:
Enforcing Monty's approach to header files: everything is included in
one place.
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_time.h | 9 | ||||
| -rw-r--r-- | include/mysql_time.h | 18 |
2 files changed, 17 insertions, 10 deletions
diff --git a/include/my_time.h b/include/my_time.h index 1212f0533e2..1c549ced6b0 100644 --- a/include/my_time.h +++ b/include/my_time.h @@ -28,6 +28,15 @@ C_MODE_START extern ulonglong log_10_int[20]; +/* + Portable time_t replacement. + Should be signed and hold seconds for 1902-2038 range. +*/ +typedef long my_time_t; + +#define MY_TIME_T_MAX LONG_MAX +#define MY_TIME_T_MIN LONG_MIN + #define YY_PART_YEAR 70 /* Flags to str_to_datetime */ diff --git a/include/mysql_time.h b/include/mysql_time.h index 32da27ba33e..ec67d60dea5 100644 --- a/include/mysql_time.h +++ b/include/mysql_time.h @@ -17,7 +17,14 @@ #ifndef _mysql_time_h_ #define _mysql_time_h_ -/* Time declarations shared between server and client library */ +/* + Time declarations shared between the server and client API: + you should not add anything to this header unless it's used + (and hence should be visible) in mysql.h. + If you're looking for a place to add new time-related declaration, + it's most likely my_time.h. See also "C API Handling of Date + and Time Values" chapter in documentation. +*/ enum enum_mysql_timestamp_type { @@ -34,13 +41,4 @@ typedef struct st_mysql_time enum enum_mysql_timestamp_type time_type; } MYSQL_TIME; - -/* - Portable time_t replacement. - Should be signed and hold seconds for 1902-2038 range. -*/ -typedef long my_time_t; -#define MY_TIME_T_MAX LONG_MAX -#define MY_TIME_T_MIN LONG_MIN - #endif /* _mysql_time_h_ */ |