Mercurial > sdl-ios-xcode
changeset 2096:87256df87837
Merge r2990:2991 from branches/SDL-1.2: try to avoid asm/page.h in fbcon.
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Wed, 14 Mar 2007 01:10:43 +0000 |
| parents | 1d9cd8266e22 |
| children | b0048df1701a |
| files | src/video/fbcon/SDL_fbvideo.c |
| diffstat | 1 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/video/fbcon/SDL_fbvideo.c Tue Feb 20 22:54:25 2007 +0000 +++ b/src/video/fbcon/SDL_fbvideo.c Wed Mar 14 01:10:43 2007 +0000 @@ -29,7 +29,11 @@ #include <unistd.h> #include <sys/ioctl.h> #include <sys/mman.h> + +#ifndef HAVE_GETPAGESIZE #include <asm/page.h> /* For definition of PAGE_SIZE */ +#endif + #include <linux/vt.h> #include "SDL_video.h"