Skip to content

Commit 57bc654

Browse files
authored
Merge pull request #188 from wilix-team/master
Rename `io.h` -> `menuIo.h` due to name collision under platformio+stm32
2 parents b387f47 + 99bc6f9 commit 57bc654

File tree

5 files changed

+3
-3
lines changed

5 files changed

+3
-3
lines changed

src/items.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@
449449

450450
////////////////////////////////////////////////////////////////////////
451451
// template implementation
452-
#include "io.h"
452+
#include "menuIo.h"
453453
#include "nav.h"
454454
namespace Menu {
455455

src/menu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ warranty, express or implied, as to its usefulness for any purpose.
5959
}
6060

6161
#include "items.h"
62-
#include "io.h"
62+
#include "menuIo.h"
6363
#include "nav.h"
6464

6565
#endif
File renamed without changes.
File renamed without changes.

src/nav.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#ifndef RSITE_ARDUINO_MENU_SYSTEM_NAV
33
#define RSITE_ARDUINO_MENU_SYSTEM_NAV
44
#include "menuBase.h"
5-
#include "io.h"
5+
#include "menuIo.h"
66
namespace Menu {
77

88
//navigation panels (min 1) describe output dimensions (in characters)

0 commit comments

Comments
 (0)