projects
/
henge
/
apc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
91bc578
)
symbol redefinition framedata_frameinfo
author
ken
<ken@mihrtec.com>
Thu, 16 Feb 2017 03:46:01 +0000
(19:46 -0800)
committer
ken
<ken@mihrtec.com>
Thu, 16 Feb 2017 03:46:01 +0000
(19:46 -0800)
src/ir.c
patch
|
blob
|
history
diff --git
a/src/ir.c
b/src/ir.c
index
c59441a
..
d6ad16f
100644
(file)
--- a/
src/ir.c
+++ b/
src/ir.c
@@
-679,13
+679,14
@@
union ir_setdata_t* ir_framebox_mapsheet
}
\r
\r
/* Return a framedata's frame info */
\r
}
\r
\r
/* Return a framedata's frame info */
\r
-struct ir_frameinfo_t* ir_framedata_
mapsheet
\r
+struct ir_frameinfo_t* ir_framedata_
frameinfo
\r
( union ir_setdata_t* framedata )
\r
{ if (framedata->header.type != MSDAT && framedata->header.type != FSDAT)
\r
eprintf("Data %s is not a framedata\n", framedata->header.data_name);
\r
return &framedata->mapsheet.frameinfo;
\r
}
\r
\r
( union ir_setdata_t* framedata )
\r
{ if (framedata->header.type != MSDAT && framedata->header.type != FSDAT)
\r
eprintf("Data %s is not a framedata\n", framedata->header.data_name);
\r
return &framedata->mapsheet.frameinfo;
\r
}
\r
\r
+
\r
/** Allocators **/
\r
static
\r
uint8_t* name_alloc
\r
/** Allocators **/
\r
static
\r
uint8_t* name_alloc
\r