--- uae/src/include/xwin.h	2018/04/24 16:38:39	1.1.1.1
+++ uae/src/include/xwin.h	2018/04/24 16:39:18	1.1.1.2
@@ -8,7 +8,7 @@
 
 typedef long int xcolnr;
 
-typedef (*allocfunc_type)(int, int, int, xcolnr *);
+typedef int (*allocfunc_type)(int, int, int, xcolnr *);
 
 extern xcolnr xcolors[4096];
 
@@ -24,7 +24,6 @@ extern void setup_brkhandler(void);
 extern void flush_line(int);
 extern void flush_block(int, int);
 extern void flush_screen(int, int);
-extern void calc_adjustment(void);
 
 extern int debuggable(void);
 extern int needmousehack(void);
@@ -32,25 +31,28 @@ extern void togglemouse(void);
 extern void LED(int);
 
 extern unsigned long doMask(int p, int bits, int shift);
+extern void setup_maxcol(int);
 extern void alloc_colors256(int (*)(int, int, int, xcolnr *));
 extern void alloc_colors64k(int, int, int, int, int, int);
 extern void setup_greydither(int bits, allocfunc_type allocfunc);
+extern void setup_greydither_maxcol(int maxcol, allocfunc_type allocfunc);
 extern void setup_dither(int bits, allocfunc_type allocfunc);
 #ifndef X86_ASSEMBLY
-extern void DitherLine(UBYTE *l, UWORD *r4g4b4, int x, int y, UWORD len, int bits);
+extern void DitherLine(UBYTE *l, UWORD *r4g4b4, int x, int y, WORD len, int bits);
 #else
 extern void DitherLine(UBYTE *l, UWORD *r4g4b4, int x, int y, UWORD len, int bits) __asm__("DitherLine");
 #endif
 
 struct vidbuf_description
 {
-    char *bufmem;
-    int rowbytes;
-    int pixbytes;
-    int maxblocklines;
-    int maxlinetoscr;
-    int x_adjust;
-    int maxline;
+    char *bufmem; /* Pointer to either the video memory or an area as large which is used as a buffer. */
+    int rowbytes; /* Bytes per row in the memory pointed at by bufmem. */
+    int pixbytes; /* Bytes per pixel. */
+    int maxlinetoscr; /* Number of pixels to draw per line. */
+    int maxline; /* Number of lines in the area pointed to by bufmem. */
+    int maxblocklines; /* Set to 0 if you want calls to flush_line after each drawn line, or the number of
+			* lines that flush_block wants to/can handle (it isn't really useful to use another
+			* value than maxline here). */
 };
 
 extern struct vidbuf_description gfxvidinfo;