Mercurial > hg > Game > Cerium
changeset 898:302ebfc75a79 draft
merge
author | Shinji KONO <kono@ie.u-ryukyu.ac.jp> |
---|---|
date | Fri, 16 Jul 2010 19:00:49 +0900 |
parents | 6bd218d3f643 (current diff) f3530a4100bf (diff) |
children | 1b9418af3127 |
files | |
diffstat | 1 files changed, 2 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/Renderer/Engine/fb.h Fri Jul 16 19:00:22 2010 +0900 +++ b/Renderer/Engine/fb.h Fri Jul 16 19:00:49 2010 +0900 @@ -19,18 +19,14 @@ void send_current_error_msg(const char *ptr); void send_current_information(const char *ptr); -/* - Don't put real function in a header... - */ +#endif + typedef struct screen_info { int xres,yres,vbpp,line_len; char *fbptr; } ScreenInfo , *ScreenInfoPtr; - -#endif - extern ScreenInfo get_fbdev_addr(void); #endif