--- uae/include/xwin.h	2018/04/24 16:37:54	1.1
+++ uae/include/xwin.h	2018/04/24 16:38:25	1.1.1.2
@@ -6,54 +6,37 @@
   * (c) 1995 Bernd Schmidt
   */
 
-extern void graphics_init(void);
-extern void graphics_leave(void);
-extern void handle_events(void);
-
-extern void prepare_line(int, bool);
-extern void flush_line(void);
-extern void flush_screen(void);
-
-extern bool debuggable(void);
-extern bool needmousehack(void);
-extern void togglemouse(void);
-extern void LED(int);
-
 typedef long int xcolnr;
 
 extern xcolnr xcolors[4096];
 
-extern bool buttonstate[3];
-extern bool newmousecounters;
+extern int buttonstate[3];
+extern int newmousecounters;
 extern int lastmx, lastmy;
 
-#ifdef INLINE_DRAWPIXEL
+extern int graphics_init(void);
+extern void graphics_leave(void);
+extern void handle_events(void);
 
-extern char *xlinebuffer;
+extern void flush_line(int);
+extern void flush_block(int, int);
+extern void flush_screen(int, int);
 
-static __inline__ void DrawPixel(int x, xcolnr col)
-{
-#ifdef INLINE_DRAWPIXEL16
-    *(short *)xlinebuffer = col;
-    xlinebuffer+=2;
-#endif
-#ifdef INLINE_DRAWPIXEL8
-    *(char *)xlinebuffer = col;
-    xlinebuffer++;
-#endif
-}
-
-#else
-#ifdef __mac__
-extern char *xlinebuffer;
+extern int debuggable(void);
+extern int needmousehack(void);
+extern void togglemouse(void);
+extern void LED(int);
 
-static inline void DrawPixel(int x, xcolnr col)
-{
-    ((short *)xlinebuffer)[x] = col;
-}
-#else /* not INLINE_DRAWPIXEL */
+extern unsigned long doMask(int p, int bits, int shift);
+extern void alloc_colors256(int (*)(int, int, int, xcolnr *));
+extern void alloc_colors64k(int, int, int, int, int, int);
 
-extern void (*DrawPixel)(int, xcolnr);
+struct vidbuf_description
+{
+    char *bufmem;
+    int rowbytes;
+    int pixbytes;
+    int maxblocklines;
+};
 
-#endif
-#endif
\ No newline at end of file
+extern struct vidbuf_description gfxvidinfo;