Skip to content

Commit fcd0729

Browse files
PetteriAimonenxiaoxiang781216
authored andcommitted
ptpd: Fix reserved word 'class'
When ptpd.h is included in C++ code, the use of identifier 'class' caused a compilation error. Changed to "clockclass".
1 parent 9abc82c commit fcd0729

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

include/netutils/ptpd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ struct ptpd_status_s
4848
uint8_t id[8]; /* Clock identity */
4949
int utcoffset; /* Offset between clock time and UTC time (seconds) */
5050
int priority1; /* Main priority field */
51-
int class; /* Clock class (IEEE-1588, lower is better) */
51+
int clockclass; /* Clock class (IEEE-1588, lower is better) */
5252
int accuracy; /* Clock accuracy (IEEE-1588, lower is better) */
5353
int variance; /* Clock variance (IEEE-1588, lower is better) */
5454
int priority2; /* Secondary priority field */

netutils/ptpd/ptpd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1342,7 +1342,7 @@ static void ptp_process_statusreq(FAR struct ptp_state_s *state)
13421342
status->clock_source_info.utcoffset =
13431343
(int16_t)(((uint16_t)s->utcoffset[0] << 8) | s->utcoffset[1]);
13441344
status->clock_source_info.priority1 = s->gm_priority1;
1345-
status->clock_source_info.class = s->gm_quality[0];
1345+
status->clock_source_info.clockclass = s->gm_quality[0];
13461346
status->clock_source_info.accuracy = s->gm_quality[1];
13471347
status->clock_source_info.priority2 = s->gm_priority2;
13481348
status->clock_source_info.variance =

system/ptpd/ptpd_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ static int do_ptpd_status(int pid)
7777

7878
printf("|- utcoffset: %d\n", status.clock_source_info.utcoffset);
7979
printf("|- priority1: %d\n", status.clock_source_info.priority1);
80-
printf("|- class: %d\n", status.clock_source_info.class);
80+
printf("|- class: %d\n", status.clock_source_info.clockclass);
8181
printf("|- accuracy: %d\n", status.clock_source_info.accuracy);
8282
printf("|- variance: %d\n", status.clock_source_info.variance);
8383
printf("|- priority2: %d\n", status.clock_source_info.priority2);

0 commit comments

Comments
 (0)