Fix multiple errors when merging symbol definitions
authorDaniel Stone <daniel@fooishbar.org>
Mon, 4 Jun 2012 11:54:54 +0000 (12:54 +0100)
committerDaniel Stone <daniel@fooishbar.org>
Mon, 4 Jun 2012 11:54:54 +0000 (12:54 +0100)
commit28e66a703a56deaedf26a8d3c0f82f99d5e79a6f
tree97eb6f4c7c36d0a3f263a451728a5f70e9005b6c
parentf43f75fb83e94224000ebc6b0736182546781c5e
Fix multiple errors when merging symbol definitions

We were getting the size calculation wrong, as well as inconsistently
picking a merge strategy.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
src/xkbcomp/symbols.c