From 9398fdaa463bc985660b5d6606ff0d15d75dec9c Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Mon, 12 Jul 2021 21:38:05 +0200 Subject: [PATCH] Work around STATUS already being defined in the ESP32 header files. --- src/protocol.c | 4 ++-- src/protocol.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/protocol.c b/src/protocol.c index 61a7608..f0e911c 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -33,7 +33,7 @@ static bool (*request_handlers[NUM_REQUESTS])(meshlink_handle_t *, connection_t *, const char *) = { [ID] = id_h, [ACK] = ack_h, - [STATUS] = status_h, + [PSTATUS] = status_h, [ERROR] = error_h, [TERMREQ] = termreq_h, [PING] = ping_h, @@ -51,7 +51,7 @@ static bool (*request_handlers[NUM_REQUESTS])(meshlink_handle_t *, connection_t static const char *request_name[NUM_REQUESTS] __attribute__((unused)) = { [ID] = "ID", [ACK] = "ACK", - [STATUS] = "STATUS", + [PSTATUS] = "STATUS", [ERROR] = "ERROR", [TERMREQ] = "TERMREQ", [PING] = "PING", diff --git a/src/protocol.h b/src/protocol.h index 02c2266..6381a61 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -38,7 +38,7 @@ typedef enum request_t { ALL = -1, /* Guardian for allow_request */ ID = 0, METAKEY, CHALLENGE, CHAL_REPLY, ACK, - STATUS, ERROR, TERMREQ, + PSTATUS, ERROR, TERMREQ, PING, PONG, ADD_SUBNET, DEL_SUBNET, ADD_EDGE, DEL_EDGE, -- 2.39.5