Skip to content

Add quotes around macro value (Issue #2193) #2197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 16, 2018
Merged

Add quotes around macro value (Issue #2193) #2197

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
601a094
Replaced ARDUINO_VARIANT with const char
Bascy Oct 11, 2018
7fb2f31
Fixed missing return value
Bascy Nov 10, 2018
686405a
Merge from upstream/master
Bascy Dec 2, 2018
d7eb665
Merge remote-tracking branch 'upstream/master'
Bascy Dec 5, 2018
49a360a
Merge remote-tracking branch 'upstream/master'
Bascy Dec 15, 2018
a29962e
Added quotes around defined value in macro (Issue #2193)
Bascy Dec 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion libraries/ESPmDNS/src/ESPmDNS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,14 @@ License (MIT license):
#include <functional>
#include "esp_wifi.h"

// Add quotes around defined value
#ifdef __IN_ECLIPSE__
#define STR_EXPAND(tok) #tok
#define STR(tok) STR_EXPAND(tok)
#else
#define STR(tok) tok
#endif

static void _on_sys_event(system_event_t *event){
mdns_handle_system_event(NULL, event);
}
Expand Down Expand Up @@ -82,7 +90,7 @@ void MDNSResponder::setInstanceName(String name) {

void MDNSResponder::enableArduino(uint16_t port, bool auth){
mdns_txt_item_t arduTxtData[4] = {
{(char*)"board" ,(char*)ARDUINO_VARIANT},
{(char*)"board" ,(char*)STR(ARDUINO_VARIANT)},
{(char*)"tcp_check" ,(char*)"no"},
{(char*)"ssh_upload" ,(char*)"no"},
{(char*)"auth_upload" ,(char*)"no"}
Expand Down