Skip to content

Commit

Permalink
Merge pull request avrdudes#1794 from stefanrueger/silence-macos-ull-…
Browse files Browse the repository at this point in the history
…warning

Silence MacOS compiler warning
  • Loading branch information
stefanrueger authored Apr 28, 2024
2 parents caf4746 + 8212836 commit ce8bb5f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/urclock.c
Original file line number Diff line number Diff line change
Expand Up @@ -1566,7 +1566,7 @@ static int ur_initstruct(const PROGRAMMER *pgm, const AVRPART *p) {
uint64_t urclockID;
if((rc = readUrclockID(pgm, p, &urclockID)) == -1)
return rc;
term_out("%0*lx", 2*ur.idlen, urclockID), first=0;
term_out("%0*llx", 2*ur.idlen, (unsigned long long) urclockID), first=0;
}
if(havemetadata) {
if(ur.showdate || ur.showall) {
Expand Down
6 changes: 3 additions & 3 deletions src/xbee.c
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,8 @@ static void xbeeStatsAdd(struct XBeeStaticticsSummary *summary,

static void xbeeStatsSummarise(struct XBeeStaticticsSummary const *summary)
{
pmsg_notice(" Minimum response time: %lu.%06lu\n", summary->minimum.tv_sec, summary->minimum.tv_usec);
pmsg_notice(" Maximum response time: %lu.%06lu\n", summary->maximum.tv_sec, summary->maximum.tv_usec);
pmsg_notice(" Minimum response time: %lu.%06lu\n", summary->minimum.tv_sec, (unsigned long) summary->minimum.tv_usec);
pmsg_notice(" Maximum response time: %lu.%06lu\n", summary->maximum.tv_sec, (unsigned long) summary->maximum.tv_usec);

struct timeval average;

Expand All @@ -261,7 +261,7 @@ static void xbeeStatsSummarise(struct XBeeStaticticsSummary const *summary)
average.tv_sec += usecs / 1000000;
average.tv_usec = usecs % 1000000;

pmsg_notice(" Average response time: %lu.%06lu\n", average.tv_sec, average.tv_usec);
pmsg_notice(" Average response time: %lu.%06lu\n", average.tv_sec, (unsigned long) average.tv_usec);
}

static void XBeeBootSessionInit(struct XBeeBootSession *xbs) {
Expand Down

0 comments on commit ce8bb5f

Please sign in to comment.