diff options
| author | unknown <lenz@mysql.com> | 2004-08-03 11:28:37 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2004-08-03 11:28:37 +0200 |
| commit | 9fac49b22cb00da862f48ffc6ad6cf9234e7c624 (patch) | |
| tree | 1406d199b7f58911222587e7a3272f383947df7d /sql-common | |
| parent | 201f8d36055c63344209264e3bafd7c80401cd94 (diff) | |
| download | mariadb-git-9fac49b22cb00da862f48ffc6ad6cf9234e7c624.tar.gz | |
- removed several C++-style comments (//) - these confuse the IBM
compiler
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/my_time.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c index df852ad8880..855e92d6648 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -680,12 +680,12 @@ my_system_gmt_sec(const MYSQL_TIME *t, long *my_timezone, bool *in_dst_time_gap) /* Get difference in days */ int days= t->day - l_time->tm_mday; if (days < -1) - days= 1; // Month has wrapped + days= 1; /* Month has wrapped */ else if (days > 1) days= -1; diff=(3600L*(long) (days*24+((int) t->hour - (int) l_time->tm_hour)) + (long) (60*((int) t->minute - (int) l_time->tm_min))); - current_timezone+= diff+3600; // Compensate for -3600 above + current_timezone+= diff+3600; /* Compensate for -3600 above */ tmp+= (time_t) diff; localtime_r(&tmp,&tm_tmp); l_time=&tm_tmp; @@ -698,15 +698,15 @@ my_system_gmt_sec(const MYSQL_TIME *t, long *my_timezone, bool *in_dst_time_gap) { int days= t->day - l_time->tm_mday; if (days < -1) - days=1; // Month has wrapped + days=1; /* Month has wrapped */ else if (days > 1) days= -1; diff=(3600L*(long) (days*24+((int) t->hour - (int) l_time->tm_hour))+ (long) (60*((int) t->minute - (int) l_time->tm_min))); if (diff == 3600) - tmp+=3600 - t->minute*60 - t->second; // Move to next hour + tmp+=3600 - t->minute*60 - t->second; /* Move to next hour */ else if (diff == -3600) - tmp-=t->minute*60 + t->second; // Move to previous hour + tmp-=t->minute*60 + t->second; /* Move to previous hour */ *in_dst_time_gap= 1; } |