diff options
| author |  Salvador Cuñat <salvador.cunat@gmail.com> | 2017-05-20 09:38:27 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-06-11 13:50:59 -0700 |
| commit | b47d18b45ac135ab9c7c0152fd9713d7aee2b407 (patch) | |
| tree | 2536189246c3eb137ffa733fcbc1e88cf914328b /smtk-import | |
| parent | 15c0a0a6ea73c391d283391e388f9645238693f7 (diff) | |
| download | subsurface-b47d18b45ac135ab9c7c0152fd9713d7aee2b407.tar.gz | |
smtk-import: portability: rename DATE
DATE happens to be defined in wtypes.h. Redefining it may be a bad idea,
so move it to _DATE
Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
Diffstat (limited to 'smtk-import')
| -rw-r--r-- | smtk-import/smartrak.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/smtk-import/smartrak.c b/smtk-import/smartrak.c index eadf4cfc1..3d9cfe0c3 100644 --- a/smtk-import/smartrak.c +++ b/smtk-import/smartrak.c @@ -62,7 +62,7 @@ static void smtk_free(char **array, int count) * a smarttrak db, and a tiny function which returns the number of the column where * a field is expected to be, taking into account the different db formats . */ -enum field_pos {IDX = 0, DIVENUM, DATE, INTIME, INTVAL, DURATION, OUTTIME, DESATBEFORE, DESATAFTER, NOFLYBEFORE, +enum field_pos {IDX = 0, DIVENUM, _DATE, INTIME, INTVAL, DURATION, OUTTIME, DESATBEFORE, DESATAFTER, NOFLYBEFORE, NOFLYAFTER, NOSTOPDECO, MAXDEPTH, VISIBILITY, WEIGHT, O2FRAC, HEFRAC, PSTART, PEND, AIRTEMP, MINWATERTEMP, MAXWATERTEMP, SECFACT, ALARMS, MODE, REMARKS, DCNUMBER, DCMODEL, DIVETIMECOUNT, LOG, PROFILE, SITEIDX, ALTIDX, SUITIDX, WEATHERIDX, SURFACEIDX, UNDERWATERIDX, TANKIDX}; @@ -921,7 +921,7 @@ void smartrak_import(const char *file, struct dive_table *divetable) smtk_clean_cylinders(smtkdive); /* Date issues with libdc parser - Take date time from mdb */ - smtk_date_to_tm(col[coln(DATE)]->bind_ptr, tm_date); + smtk_date_to_tm(col[coln(_DATE)]->bind_ptr, tm_date); smtk_time_to_tm(col[coln(INTIME)]->bind_ptr, tm_date); smtkdive->dc.when = smtkdive->when = timegm(tm_date); free(tm_date); |