Changeset b47d18b4 in subsurface


Ignore:
Timestamp:
Jun 11, 2017, 1:50:59 PM (2 months ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
95ee579
Parents:
15c0a0a
git-author:
Salvador Cuñat <salvador.cunat@…> (05/20/17 00:38:27)
git-committer:
Dirk Hohndel <dirk@…> (06/11/17 13:50:59)
Message:

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@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • smtk-import/smartrak.c

    r15c0a0a rb47d18b4  
    6363 * a field is expected to be, taking into account the different db formats .
    6464 */
    65 enum field_pos {IDX = 0, DIVENUM, DATE, INTIME, INTVAL, DURATION, OUTTIME, DESATBEFORE, DESATAFTER, NOFLYBEFORE,
     65enum field_pos {IDX = 0, DIVENUM, _DATE, INTIME, INTVAL, DURATION, OUTTIME, DESATBEFORE, DESATAFTER, NOFLYBEFORE,
    6666                NOFLYAFTER, NOSTOPDECO, MAXDEPTH, VISIBILITY, WEIGHT, O2FRAC, HEFRAC, PSTART, PEND, AIRTEMP,
    6767                MINWATERTEMP, MAXWATERTEMP, SECFACT, ALARMS, MODE, REMARKS, DCNUMBER, DCMODEL, DIVETIMECOUNT, LOG,
     
    922922
    923923                /* Date issues with libdc parser - Take date time from mdb */
    924                 smtk_date_to_tm(col[coln(DATE)]->bind_ptr, tm_date);
     924                smtk_date_to_tm(col[coln(_DATE)]->bind_ptr, tm_date);
    925925                smtk_time_to_tm(col[coln(INTIME)]->bind_ptr, tm_date);
    926926                smtkdive->dc.when = smtkdive->when = timegm(tm_date);
Note: See TracChangeset for help on using the changeset viewer.