diff options
| author | OLFDB <olf@eisenzelt.de> | 2023-03-07 13:41:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-07 13:41:29 +0100 |
| commit | d85f71ecf4c48baf428da17697b43f2a11129db1 (patch) | |
| tree | be33d03f7fa92d455500b16d4b389fb95ff2c188 /navit/attr.h | |
| parent | 2ac4a843483735f8fd4e932fcab536a0aa46be5d (diff) | |
| download | navit-d85f71ecf4c48baf428da17697b43f2a11129db1.tar.gz | |
* Initial commit
* Fix:#1185
* Fix:#1185
* Update after further tests
* Update navit.c
Missing opening bracket.
* Update navit.c
Needs AND not OR when combining if clauses.
* Revert "Fix:#1185"
This reverts commit fd91e400dfc5bfa83ee4565c2ab9e222188eee77.
* Revert "Fix:#1185"
This reverts commit be87cd30a0b153158bc68b3eb83601aadeda322c.
* Fix: Warning during build
* WINCE compiler needs pragma to be outside of a function
Diffstat (limited to 'navit/attr.h')
| -rw-r--r-- | navit/attr.h | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/navit/attr.h b/navit/attr.h index cae591ffd..5eed1718f 100644 --- a/navit/attr.h +++ b/navit/attr.h @@ -28,28 +28,7 @@ extern "C" { enum item_type; -/** - * Attribute type values, created using macro magic. - */ -enum attr_type { -#define ATTR2(x,y) attr_##y=x, -#define ATTR(x) attr_##x, - - /* Special macro for unused attribute types. Creates a placeholder entry - * in the enum so the following values do not change. */ -#define ATTR_UNUSED ATTR_UNUSED_L(__LINE__) -#define ATTR_UNUSED_L(x) ATTR_UNUSED_WITH_LINE_NUMBER(x) -#define ATTR_UNUSED_WITH_LINE_NUMBER(x) ATTR_UNUSED_##x, - -#include "attr_def.h" - -#undef ATTR_UNUSED_WITH_LINE_NUMBER -#undef ATTR_UNUSED_L -#undef ATTR_UNUSED - -#undef ATTR2 -#undef ATTR -}; +#include "attr_type_def.h" enum attr_format { attr_format_default=0, |