language_pt-br_utf8 warnings due to extra tokens at end of #else directive#15013
Merged
thinkyhead merged 1 commit intoMarlinFirmware:bugfix-1.1.xfrom Aug 21, 2019
Conversation
Fix language_pt-br_utf8 warnings due to extra tokens at end of #else directive
thinkyhead
force-pushed
the
feature/language_pt_br_utf8_small_lcd_height
branch
from
d995ff6 to
a412224
Compare
thinkyhead
pushed a commit
that referenced
this pull request
Sep 2, 2019
TiagoJustino
added a commit
to TiagoJustino/Marlin
that referenced
this pull request
Apr 2, 2020
* MarlinFirmware/1.1.x: (133 commits) Fix Z position after ABL bilinear G29 with fade (MarlinFirmware#17174) Change DUMMY_PID_VALUE to NAN (MarlinFirmware#17079) Disable integration testing Enable DUAL_NOZZLE_DUPLICATION_MODE (MarlinFirmware#16436) [1.1.x] Polish language UTF8 (MarlinFirmware#16141) Links for the "New Issue" page Add Korean language (MarlinFirmware#15918) [1.1.x] MKS_GEN_L_V2 controller (MarlinFirmware#15805) Update bug_report.md [1.1.x] Fix autostart w/out SD_DETECT_PIN (MarlinFirmware#15667) [1.1.x] RAMPS + Viki1 LCD compatibility (MarlinFirmware#15736) [1.1.x] Fix compiler warning (MarlinFirmware#15642) [1.1.x] Fix for G2/G3 rounding error (MarlinFirmware#15546) Let MINIPANEL use SW SPI if needed (MarlinFirmware#15246) Fix BLTouch debugging (MarlinFirmware#15232) Fix Creality bed thermistor Fix PT-BR strings (MarlinFirmware#15023) Fix #else extra tokens (MarlinFirmware#15013) [1.1.x] Autobuild formatting (MarlinFirmware#14858) [1.1.x] BLTouch 3.0 - 3.1 (MarlinFirmware#14839) ...
maz3max
pushed a commit
to maz3max/Marlin
that referenced
this pull request
Aug 24, 2021
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When the LCD language is changed to pt-br_utf8, we get a lot of warns.
It is because of the extra tokens at end of the #else directive.
Description
After changing the LCD language to pt-br_utf8:
#define LCD_LANGUAGE pt-br_utf8
It will give us a warn:
In file included from sketch/language.h:317:0,
from sketch/MarlinConfig.h:44,
from sketch/ubl_motion.cpp:22:
sketch/language_pt-br_utf8.h:374:7: warning: extra tokens at end of #else directive [-Wendif-labels]
#else LCD_HEIGHT < 4
^
To fix it, we need to comment out the "LCD_HEIGHT < 4" as on the language_en.h file.
#else // LCD_HEIGHT < 4
Benefits
It removes all the warns related with the extra tokens at end of #else directive