Skip to content

Commit

Permalink
drivers/cc3000: Use cc3000_time_t instead of time_t for custom typedef.
Browse files Browse the repository at this point in the history
Otherwise it can clash with time_t from the C standard include headers.
  • Loading branch information
rolandvs authored and dpgeorge committed Aug 8, 2018
1 parent 17b5120 commit c1c798f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/cc3000/inc/cc3000_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -165,15 +165,15 @@ extern int CC3000_EXPORT(errno);
//*****************************************************************************
// Compound Types
//*****************************************************************************
typedef INT32 time_t;
typedef INT32 cc3000_time_t;
typedef UINT32 clock_t;
typedef INT32 suseconds_t;

typedef struct cc3000_timeval cc3000_timeval;

struct cc3000_timeval
{
time_t tv_sec; /* seconds */
cc3000_time_t tv_sec; /* seconds */
suseconds_t tv_usec; /* microseconds */
};

Expand Down

0 comments on commit c1c798f

Please sign in to comment.