diff options
| author | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-08-31 12:28:17 +0000 |
|---|---|---|
| committer | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-08-31 12:28:17 +0000 |
| commit | 53c87d62e4416435462d689f5e13de6f68fb1275 (patch) | |
| tree | 1b6797b1004b8fa162d75ce5e2c4a78342acaf73 /navit/attr.h | |
| parent | f858a968c1257e22a43e95b67ee0ecfc35a3a23d (diff) | |
| download | navit-svn-53c87d62e4416435462d689f5e13de6f68fb1275.tar.gz | |
Fix:maptool:Fix cast warnings by using GINT_TO_POINTER, and designated initializers for union.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5882 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/attr.h')
| -rw-r--r-- | navit/attr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/navit/attr.h b/navit/attr.h index 93cdde85..8000f52c 100644 --- a/navit/attr.h +++ b/navit/attr.h @@ -121,8 +121,8 @@ enum attr_position_valid { #define ATTR_IS_COORD(x) ((x) >= attr_type_coord_begin && (x) <= attr_type_coord_end) #define ATTR_IS_GROUP(x) ((x) >= attr_type_group_begin && (x) <= attr_type_group_end) -#define ATTR_INT(x,y) ((struct attr){attr_##x,{(char *)(y)}}) -#define ATTR_OBJECT(x,y) ((struct attr){attr_##x,{(char *)(y)}}) +#define ATTR_INT(x,y) ((struct attr){attr_##x,{.num=y}}) +#define ATTR_OBJECT(x,y) ((struct attr){attr_##x,{.navit=y}}) #define ATTR_DEF_STR(x,y) (&(struct attr){attr_##x,{y}}) #define ATTR_DEF_INT(x,y) (&(struct attr){attr_##x,{(char *)(y)}}) #define ATTR_DEF_ITEMS(x,...) (&(struct attr){attr_##x,{(char *)((enum item_type[]){__VA_ARGS__ , type_none})}}) |