diff options
author | inmarket <andrewh@inmarket.com.au> | 2014-11-26 13:01:47 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2014-11-26 13:02:47 +1000 |
commit | bd3a58ccfc0a484e18cd562539edc71c2f8ebefc (patch) | |
tree | 46b7f6ce86eb194df8d2a72928d4bffb04ce0bf7 /src/gdisp | |
parent | 746527632c1fd6a35f23c828a2bb392bcfc1659a (diff) | |
download | uGFX-bd3a58ccfc0a484e18cd562539edc71c2f8ebefc.tar.gz uGFX-bd3a58ccfc0a484e18cd562539edc71c2f8ebefc.tar.bz2 uGFX-bd3a58ccfc0a484e18cd562539edc71c2f8ebefc.zip |
Fix some extern structure definitions that cause problems with some compilers
Diffstat (limited to 'src/gdisp')
-rw-r--r-- | src/gdisp/gdisp_gdisp.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/gdisp/gdisp_gdisp.c b/src/gdisp/gdisp_gdisp.c index f5675a82..dcac102d 100644 --- a/src/gdisp/gdisp_gdisp.c +++ b/src/gdisp/gdisp_gdisp.c @@ -561,6 +561,8 @@ static void line_clip(GDisplay *g) { /* Driver exported functions. */ /*===========================================================================*/ +typedef const GDISPVMT const GDISPVMTLIST[]; + void _gdispInit(void) { // GDISP_DRIVER_LIST is defined - create each driver instance @@ -568,19 +570,19 @@ void _gdispInit(void) { unsigned i; - extern GDriverVMTList GDISP_DRIVER_LIST; - static const struct GDriverVMT const * dclist[] = {GDISP_DRIVER_LIST}; + extern GDISPVMTLIST GDISP_DRIVER_LIST; + static GDISPVMTLIST dclist[] = {GDISP_DRIVER_LIST}; for(i = 0; i < sizeof(dclist)/sizeof(dclist[0]); i++) - gdriverRegister(dclist[i], 0); + gdriverRegister(&dclist[i]->d, 0); } #elif GDISP_TOTAL_DISPLAYS > 1 { unsigned i; - extern GDriverVMTList GDISPVMT_OnlyOne; + extern GDISPVMTLIST GDISPVMT_OnlyOne; for(i = 0; i < GDISP_TOTAL_DISPLAYS; i++) - gdriverRegister(GDISPVMT_OnlyOne, 0); + gdriverRegister(&GDISPVMT_OnlyOne->d, 0); } #else { |