diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-08 13:59:32 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-08 13:59:32 +0000 |
| commit | 1ae1f3dee798a8468a415eaa8f1da78e9d3fbae8 (patch) | |
| tree | 5ff2d27dc0c94b02beedeb4551f677691e606352 /xorg-server/hw/kdrive/ephyr/ephyr.h | |
| parent | d5ac51b006c039894e4e35102a8e182d21a52efc (diff) | |
| parent | 91a30d5622174febaa2107b010effcf2fb5b9a2e (diff) | |
| download | vcxsrv-1ae1f3dee798a8468a415eaa8f1da78e9d3fbae8.tar.gz vcxsrv-1ae1f3dee798a8468a415eaa8f1da78e9d3fbae8.tar.bz2 vcxsrv-1ae1f3dee798a8468a415eaa8f1da78e9d3fbae8.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/hw/kdrive/ephyr/ephyr.h')
| -rw-r--r-- | xorg-server/hw/kdrive/ephyr/ephyr.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/xorg-server/hw/kdrive/ephyr/ephyr.h b/xorg-server/hw/kdrive/ephyr/ephyr.h index 5479736e3..e4ce84dee 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyr.h +++ b/xorg-server/hw/kdrive/ephyr/ephyr.h @@ -118,10 +118,10 @@ void ephyrCardFini (KdCardInfo *card);
void
-ephyrGetColors (ScreenPtr pScreen, int fb, int n, xColorItem *pdefs);
+ephyrGetColors (ScreenPtr pScreen, int n, xColorItem *pdefs);
void
-ephyrPutColors (ScreenPtr pScreen, int fb, int n, xColorItem *pdefs);
+ephyrPutColors (ScreenPtr pScreen, int n, xColorItem *pdefs);
Bool
ephyrMapFramebuffer (KdScreenInfo *screen);
@@ -182,6 +182,10 @@ extern Bool ephyrCursorInit(ScreenPtr pScreen); extern void ephyrCursorEnable(ScreenPtr pScreen);
+extern int ephyrBufferHeight(KdScreenInfo *screen);
+
+extern int ephyrBufferHeight(KdScreenInfo *screen);
+
/* ephyr_draw.c */
Bool
|