[brlcad-commits] SF.net SVN: brlcad:[36906] brlcad/trunk/src/libfb

[<sta...@us...>]

Revision: 36906
          http://brlcad.svn.sourceforge.net/brlcad/?rev=36906&view=rev
Author:   starseeker
Date:     2009-12-15 00:00:56 +0000 (Tue, 15 Dec 2009)

Log Message:
-----------
Get rid of forward declarations

Modified Paths:
--------------
    brlcad/trunk/src/libfb/if_debug.c
    brlcad/trunk/src/libfb/if_disk.c
    brlcad/trunk/src/libfb/if_mem.c
    brlcad/trunk/src/libfb/if_null.c
    brlcad/trunk/src/libfb/if_remote.c
    brlcad/trunk/src/libfb/if_stack.c

Modified: brlcad/trunk/src/libfb/if_debug.c
===================================================================
--- brlcad/trunk/src/libfb/if_debug.c	2009-12-14 23:49:39 UTC (rev 36905)
+++ brlcad/trunk/src/libfb/if_debug.c	2009-12-15 00:00:56 UTC (rev 36906)
@@ -33,73 +33,6 @@
 
 #include "fb.h"
 
-
-HIDDEN int	deb_open(FBIO *ifp, char *file, int width, int height),
-    deb_close(FBIO *ifp),
-    deb_clear(FBIO *ifp, unsigned char *pp),
-    deb_read(FBIO *ifp, int x, int y, unsigned char *pixelp, int count),
-    deb_write(FBIO *ifp, int x, int y, const unsigned char *pixelp, int count),
-    deb_rmap(FBIO *ifp, ColorMap *cmp),
-    deb_wmap(FBIO *ifp, const ColorMap *cmp),
-    deb_view(FBIO *ifp, int xcenter, int ycenter, int xzoom, int yzoom),
-    deb_getview(FBIO *ifp, int *xcenter, int *ycenter, int *xzoom, int *yzoom),
-    deb_setcursor(FBIO *ifp, const unsigned char *bits, int xbits, int ybits, int xorig, int yorig),
-    deb_cursor(FBIO *ifp, int mode, int x, int y),
-    deb_getcursor(FBIO *ifp, int *mode, int *x, int *y),
-    deb_readrect(FBIO *ifp, int xmin, int ymin, int width, int height, unsigned char *pp),
-    deb_writerect(FBIO *ifp, int xmin, int ymin, int width, int height, const unsigned char *pp),
-    deb_bwreadrect(FBIO *ifp, int xmin, int ymin, int width, int height, unsigned char *pp),
-    deb_bwwriterect(FBIO *ifp, int xmin, int ymin, int width, int height, const unsigned char *pp),
-    deb_poll(FBIO *ifp),
-    deb_flush(FBIO *ifp),
-    deb_free(FBIO *ifp),
-    deb_help(FBIO *ifp);
-
-/* This is the ONLY thing that we "export" */
-FBIO debug_interface = {
-    0,
-    deb_open,
-    deb_close,
-    deb_clear,
-    deb_read,
-    deb_write,
-    deb_rmap,
-    deb_wmap,
-    deb_view,
-    deb_getview,
-    deb_setcursor,
-    deb_cursor,
-    deb_getcursor,
-    deb_readrect,
-    deb_writerect,
-    deb_bwreadrect,
-    deb_bwwriterect,
-    deb_poll,
-    deb_flush,
-    deb_free,
-    deb_help,
-    "Debugging Interface",
-    32*1024,		/* max width */
-    32*1024,		/* max height */
-    "/dev/debug",
-    512,			/* current/default width */
-    512,			/* current/default height */
-    -1,			/* select fd */
-    -1,			/* file descriptor */
-    1, 1,			/* zoom */
-    256, 256,		/* window center */
-    0, 0, 0,		/* cursor */
-    PIXEL_NULL,		/* page_base */
-    PIXEL_NULL,		/* page_curp */
-    PIXEL_NULL,		/* page_endp */
-    -1,			/* page_no */
-    0,			/* page_ref */
-    0L,			/* page_curpos */
-    0L,			/* page_pixels */
-    0			/* debug */
-};
-
-
 HIDDEN int
 deb_open(FBIO *ifp, char *file, int width, int height)
 {
@@ -367,6 +300,51 @@
     return	0;
 }
 
+/* This is the ONLY thing that we "export" */
+FBIO debug_interface = {
+    0,
+    deb_open,
+    deb_close,
+    deb_clear,
+    deb_read,
+    deb_write,
+    deb_rmap,
+    deb_wmap,
+    deb_view,
+    deb_getview,
+    deb_setcursor,
+    deb_cursor,
+    deb_getcursor,
+    deb_readrect,
+    deb_writerect,
+    deb_bwreadrect,
+    deb_bwwriterect,
+    deb_poll,
+    deb_flush,
+    deb_free,
+    deb_help,
+    "Debugging Interface",
+    32*1024,		/* max width */
+    32*1024,		/* max height */
+    "/dev/debug",
+    512,			/* current/default width */
+    512,			/* current/default height */
+    -1,			/* select fd */
+    -1,			/* file descriptor */
+    1, 1,			/* zoom */
+    256, 256,		/* window center */
+    0, 0, 0,		/* cursor */
+    PIXEL_NULL,		/* page_base */
+    PIXEL_NULL,		/* page_curp */
+    PIXEL_NULL,		/* page_endp */
+    -1,			/* page_no */
+    0,			/* page_ref */
+    0L,			/* page_curpos */
+    0L,			/* page_pixels */
+    0			/* debug */
+};
+
+
 /*
  * Local Variables:
  * mode: C

Modified: brlcad/trunk/src/libfb/if_disk.c
===================================================================
--- brlcad/trunk/src/libfb/if_disk.c	2009-12-14 23:49:39 UTC (rev 36905)
+++ brlcad/trunk/src/libfb/if_disk.c	2009-12-15 00:00:56 UTC (rev 36906)
@@ -44,62 +44,8 @@
 #define	DISK_DMA_BYTES	(16*1024/sizeof(RGBpixel)*sizeof(RGBpixel))
 #define	DISK_DMA_PIXELS	(DISK_DMA_BYTES/sizeof(RGBpixel))
 
-HIDDEN int	dsk_open(FBIO *ifp, char *file, int width, int height),
-    dsk_close(FBIO *ifp),
-    dsk_clear(FBIO *ifp, unsigned char *bgpp),
-    dsk_read(FBIO *ifp, int x, int y, unsigned char *pixelp, int count),
-    dsk_write(FBIO *ifp, int x, int y, const unsigned char *pixelp, int count),
-    dsk_rmap(FBIO *ifp, ColorMap *cmap),
-    dsk_wmap(FBIO *ifp, const ColorMap *cmap),
-    dsk_free(FBIO *ifp),
-    dsk_help(FBIO *ifp);
-
-FBIO disk_interface = {
-    0,
-    dsk_open,
-    dsk_close,
-    dsk_clear,
-    dsk_read,
-    dsk_write,
-    dsk_rmap,
-    dsk_wmap,
-    fb_sim_view,		/* set view */
-    fb_sim_getview,		/* get view */
-    fb_null_setcursor,		/* define cursor */
-    fb_sim_cursor,		/* set cursor */
-    fb_sim_getcursor,	/* get cursor */
-    fb_sim_readrect,
-    fb_sim_writerect,
-    fb_sim_bwreadrect,
-    fb_sim_bwwriterect,
-    fb_null,		/* poll */
-    fb_null,		/* flush */
-    dsk_free,
-    dsk_help,
-    "Disk File Interface",
-    32*1024,		/* the sky's really the limit here */
-    32*1024,
-    "filename",		/* not in list so name is safe */
-    512,
-    512,
-    -1,			/* select fd */
-    -1,
-    1, 1,			/* zoom */
-    256, 256,		/* window center */
-    0, 0, 0,		/* cursor */
-    PIXEL_NULL,
-    PIXEL_NULL,
-    PIXEL_NULL,
-    -1,
-    0,
-    0L,
-    0L,
-    0
-};
-
 #define if_seekpos	u5.l	/* stored seek position */
 
-HIDDEN int	disk_color_clear(FBIO *ifp, register unsigned char *bpp);
 
 HIDDEN int
 dsk_open(FBIO *ifp, char *file, int width, int height)
@@ -170,7 +116,47 @@
     return unlink(ifp->if_name);
 }
 
+/*
+ *		D I S K _ C O L O R _ C L E A R
+ *
+ *  Clear the disk file to the given color.
+ */
 HIDDEN int
+disk_color_clear(FBIO *ifp, register unsigned char *bpp)
+{
+    static unsigned char	pix_buf[DISK_DMA_BYTES] = {0};
+    register unsigned char *pix_to;
+    register long	i;
+    int	fd, pixelstodo;
+
+    /* Fill buffer with background color. */
+    for ( i = DISK_DMA_PIXELS, pix_to = pix_buf; i > 0; i-- ) {
+	COPYRGB( pix_to, bpp );
+	pix_to += sizeof(RGBpixel);
+    }
+
+    /* Set start of framebuffer */
+    fd = ifp->if_fd;
+    if ( ifp->if_seekpos != 0L && lseek( fd, (off_t)0L, 0 ) == -1 ) {
+	fb_log( "disk_color_clear : seek failed.\n" );
+	return	-1;
+    }
+
+    /* Send until frame buffer is full. */
+    pixelstodo = ifp->if_height * ifp->if_width;
+    while ( pixelstodo > 0 ) {
+	i = pixelstodo > DISK_DMA_PIXELS ? DISK_DMA_PIXELS : pixelstodo;
+	if ( write( fd, pix_buf, i * sizeof(RGBpixel) ) == -1 )
+	    return	-1;
+	pixelstodo -= i;
+	ifp->if_seekpos += i * sizeof(RGBpixel);
+    }
+
+    return	0;
+}
+
+
+HIDDEN int
 dsk_clear(FBIO *ifp, unsigned char *bgpp)
 {
     static RGBpixel	black = { 0, 0, 0 };
@@ -303,45 +289,7 @@
     return	0;
 }
 
-/*
- *		D I S K _ C O L O R _ C L E A R
- *
- *  Clear the disk file to the given color.
- */
-HIDDEN int
-disk_color_clear(FBIO *ifp, register unsigned char *bpp)
-{
-    static unsigned char	pix_buf[DISK_DMA_BYTES] = {0};
-    register unsigned char *pix_to;
-    register long	i;
-    int	fd, pixelstodo;
 
-    /* Fill buffer with background color. */
-    for ( i = DISK_DMA_PIXELS, pix_to = pix_buf; i > 0; i-- ) {
-	COPYRGB( pix_to, bpp );
-	pix_to += sizeof(RGBpixel);
-    }
-
-    /* Set start of framebuffer */
-    fd = ifp->if_fd;
-    if ( ifp->if_seekpos != 0L && lseek( fd, (off_t)0L, 0 ) == -1 ) {
-	fb_log( "disk_color_clear : seek failed.\n" );
-	return	-1;
-    }
-
-    /* Send until frame buffer is full. */
-    pixelstodo = ifp->if_height * ifp->if_width;
-    while ( pixelstodo > 0 ) {
-	i = pixelstodo > DISK_DMA_PIXELS ? DISK_DMA_PIXELS : pixelstodo;
-	if ( write( fd, pix_buf, i * sizeof(RGBpixel) ) == -1 )
-	    return	-1;
-	pixelstodo -= i;
-	ifp->if_seekpos += i * sizeof(RGBpixel);
-    }
-
-    return	0;
-}
-
 HIDDEN int
 dsk_help(FBIO *ifp)
 {
@@ -363,6 +311,49 @@
     return(0);
 }
 
+FBIO disk_interface = {
+    0,
+    dsk_open,
+    dsk_close,
+    dsk_clear,
+    dsk_read,
+    dsk_write,
+    dsk_rmap,
+    dsk_wmap,
+    fb_sim_view,		/* set view */
+    fb_sim_getview,		/* get view */
+    fb_null_setcursor,		/* define cursor */
+    fb_sim_cursor,		/* set cursor */
+    fb_sim_getcursor,	/* get cursor */
+    fb_sim_readrect,
+    fb_sim_writerect,
+    fb_sim_bwreadrect,
+    fb_sim_bwwriterect,
+    fb_null,		/* poll */
+    fb_null,		/* flush */
+    dsk_free,
+    dsk_help,
+    "Disk File Interface",
+    32*1024,		/* the sky's really the limit here */
+    32*1024,
+    "filename",		/* not in list so name is safe */
+    512,
+    512,
+    -1,			/* select fd */
+    -1,
+    1, 1,			/* zoom */
+    256, 256,		/* window center */
+    0, 0, 0,		/* cursor */
+    PIXEL_NULL,
+    PIXEL_NULL,
+    PIXEL_NULL,
+    -1,
+    0,
+    0L,
+    0L,
+    0
+};
+
 /*
  * Local Variables:
  * mode: C

Modified: brlcad/trunk/src/libfb/if_mem.c
===================================================================
--- brlcad/trunk/src/libfb/if_mem.c	2009-12-14 23:49:39 UTC (rev 36905)
+++ brlcad/trunk/src/libfb/if_mem.c	2009-12-15 00:00:56 UTC (rev 36906)
@@ -39,66 +39,6 @@
 #include "fb.h"
 
 
-HIDDEN int	mem_open(FBIO *ifp, char *file, int width, int height),
-    mem_close(FBIO *ifp),
-    mem_clear(FBIO *ifp, unsigned char *pp),
-    mem_read(FBIO *ifp, int x, int y, unsigned char *pixelp, int count),
-    mem_write(FBIO *ifp, int x, int y, const unsigned char *pixelp, int count),
-    mem_rmap(FBIO *ifp, ColorMap *cmp),
-    mem_wmap(FBIO *ifp, const ColorMap *cmp),
-    mem_view(FBIO *ifp, int xcenter, int ycenter, int xzoom, int yzoom),
-    mem_getview(FBIO *ifp, int *xcenter, int *ycenter, int *xzoom, int *yzoom),
-    mem_setcursor(FBIO *ifp, const unsigned char *bits, int xbits, int ybits, int xorig, int yorig),
-    mem_cursor(FBIO *ifp, int mode, int x, int y),
-    mem_getcursor(FBIO *ifp, int *mode, int *x, int *y),
-    mem_poll(FBIO *ifp),
-    mem_flush(FBIO *ifp),
-    mem_help(FBIO *ifp);
-
-/* This is the ONLY thing that we normally "export" */
-FBIO memory_interface =  {
-    0,
-    mem_open,		/* device_open		*/
-    mem_close,		/* device_close		*/
-    mem_clear,		/* device_clear		*/
-    mem_read,		/* buffer_read		*/
-    mem_write,		/* buffer_write		*/
-    mem_rmap,		/* colormap_read	*/
-    mem_wmap,		/* colormap_write	*/
-    mem_view,		/* set view		*/
-    mem_getview,		/* get view		*/
-    mem_setcursor,		/* define cursor	*/
-    mem_cursor,		/* set cursor		*/
-    mem_getcursor,		/* get cursor		*/
-    fb_sim_readrect,	/* rectangle read	*/
-    fb_sim_writerect,	/* rectangle write	*/
-    fb_sim_bwreadrect,
-    fb_sim_bwwriterect,
-    mem_poll,		/* poll			*/
-    mem_flush,		/* flush		*/
-    mem_close,		/* free			*/
-    mem_help,		/* help message		*/
-    "Memory Buffer",	/* device description	*/
-    8192,			/* max width		*/
-    8192,			/* max height		*/
-    "/dev/mem",		/* short device name	*/
-    512,			/* default/current width  */
-    512,			/* default/current height */
-    -1,			/* select fd		*/
-    -1,			/* file descriptor	*/
-    1, 1,			/* zoom			*/
-    256, 256,		/* window center	*/
-    0, 0, 0,		/* cursor		*/
-    PIXEL_NULL,		/* page_base		*/
-    PIXEL_NULL,		/* page_curp		*/
-    PIXEL_NULL,		/* page_endp		*/
-    -1,			/* page_no		*/
-    0,			/* page_dirty		*/
-    0L,			/* page_curpos		*/
-    0L,			/* page_pixels		*/
-    0			/* debug		*/
-};
-
 /* Per connection private info */
 struct	meminfo {
     FBIO	*fbp;		/* attached frame buffer (if any) */
@@ -475,6 +415,50 @@
     return(0);
 }
 
+/* This is the ONLY thing that we normally "export" */
+FBIO memory_interface =  {
+    0,
+    mem_open,		/* device_open		*/
+    mem_close,		/* device_close		*/
+    mem_clear,		/* device_clear		*/
+    mem_read,		/* buffer_read		*/
+    mem_write,		/* buffer_write		*/
+    mem_rmap,		/* colormap_read	*/
+    mem_wmap,		/* colormap_write	*/
+    mem_view,		/* set view		*/
+    mem_getview,		/* get view		*/
+    mem_setcursor,		/* define cursor	*/
+    mem_cursor,		/* set cursor		*/
+    mem_getcursor,		/* get cursor		*/
+    fb_sim_readrect,	/* rectangle read	*/
+    fb_sim_writerect,	/* rectangle write	*/
+    fb_sim_bwreadrect,
+    fb_sim_bwwriterect,
+    mem_poll,		/* poll			*/
+    mem_flush,		/* flush		*/
+    mem_close,		/* free			*/
+    mem_help,		/* help message		*/
+    "Memory Buffer",	/* device description	*/
+    8192,			/* max width		*/
+    8192,			/* max height		*/
+    "/dev/mem",		/* short device name	*/
+    512,			/* default/current width  */
+    512,			/* default/current height */
+    -1,			/* select fd		*/
+    -1,			/* file descriptor	*/
+    1, 1,			/* zoom			*/
+    256, 256,		/* window center	*/
+    0, 0, 0,		/* cursor		*/
+    PIXEL_NULL,		/* page_base		*/
+    PIXEL_NULL,		/* page_curp		*/
+    PIXEL_NULL,		/* page_endp		*/
+    -1,			/* page_no		*/
+    0,			/* page_dirty		*/
+    0L,			/* page_curpos		*/
+    0L,			/* page_pixels		*/
+    0			/* debug		*/
+};
+
 /*
  * Local Variables:
  * mode: C

Modified: brlcad/trunk/src/libfb/if_null.c
===================================================================
--- brlcad/trunk/src/libfb/if_null.c	2009-12-14 23:49:39 UTC (rev 36905)
+++ brlcad/trunk/src/libfb/if_null.c	2009-12-15 00:00:56 UTC (rev 36906)
@@ -38,70 +38,6 @@
 #include "fb.h"
 
 
-HIDDEN int	null_open(FBIO *ifp, char *file, int width, int height),
-    null_close(FBIO *ifp),
-    null_clear(FBIO *ifp, unsigned char *pp),
-    null_read(FBIO *ifp, int x, int y, unsigned char *pixelp, int count),
-    null_write(FBIO *ifp, int x, int y, const unsigned char *pixelp, int count),
-    null_rmap(FBIO *ifp, ColorMap *cmp),
-    null_wmap(FBIO *ifp, const ColorMap *cmp),
-    null_view(FBIO *ifp, int xcenter, int ycenter, int xzoom, int yzoom),
-    null_getview(FBIO *ifp, int *xcenter, int *ycenter, int *xzoom, int *yzoom),
-    null_setcursor(FBIO *ifp, const unsigned char *bits, int xbits, int ybits, int xorig, int yorig),
-    null_cursor(FBIO *ifp, int mode, int x, int y),
-    null_getcursor(FBIO *ifp, int *mode, int *x, int *y),
-    null_readrect(FBIO *ifp, int xmin, int ymin, int width, int height, unsigned char *pp),
-    null_writerect(FBIO *ifp, int xmin, int ymin, int width, int height, const unsigned char *pp),
-    null_poll(FBIO *ifp),
-    null_flush(FBIO *ifp),
-    null_free(FBIO *ifp),
-    null_help(FBIO *ifp);
-
-/* This is the ONLY thing that we normally "export" */
-FBIO null_interface =  {
-    0,
-    null_open,		/* device_open		*/
-    null_close,		/* device_close		*/
-    null_clear,		/* device_clear		*/
-    null_read,		/* buffer_read		*/
-    null_write,		/* buffer_write		*/
-    null_rmap,		/* colormap_read	*/
-    null_wmap,		/* colormap_write	*/
-    null_view,		/* set view		*/
-    null_getview,		/* get view		*/
-    null_setcursor,		/* define cursor	*/
-    null_cursor,		/* set cursor		*/
-    null_getcursor,		/* get cursor		*/
-    null_readrect,		/* rectangle read	*/
-    null_writerect,		/* rectangle write	*/
-    null_readrect,		/* bw rectangle read	*/
-    null_writerect,		/* bw rectangle write	*/
-    null_poll,		/* handle events	*/
-    null_flush,		/* flush output		*/
-    null_free,		/* free resources	*/
-    null_help,		/* help message		*/
-    "Null Device",		/* device description	*/
-    32*1024,		/* max width		*/
-    32*1024,		/* max height		*/
-    "/dev/null",		/* short device name	*/
-    512,			/* default/current width  */
-    512,			/* default/current height */
-    -1,			/* select fd		*/
-    -1,			/* file descriptor	*/
-    1, 1,			/* zoom			*/
-    256, 256,		/* window center	*/
-    0, 0, 0,		/* cursor		*/
-    PIXEL_NULL,		/* page_base		*/
-    PIXEL_NULL,		/* page_curp		*/
-    PIXEL_NULL,		/* page_endp		*/
-    -1,			/* page_no		*/
-    0,			/* page_dirty		*/
-    0L,			/* page_curpos		*/
-    0L,			/* page_pixels		*/
-    0			/* debug		*/
-};
-
-
 HIDDEN int
 null_open(FBIO *ifp, char *file, int width, int height)
 {
@@ -229,6 +165,50 @@
     return(0);
 }
 
+/* This is the ONLY thing that we normally "export" */
+FBIO null_interface =  {
+    0,
+    null_open,		/* device_open		*/
+    null_close,		/* device_close		*/
+    null_clear,		/* device_clear		*/
+    null_read,		/* buffer_read		*/
+    null_write,		/* buffer_write		*/
+    null_rmap,		/* colormap_read	*/
+    null_wmap,		/* colormap_write	*/
+    null_view,		/* set view		*/
+    null_getview,		/* get view		*/
+    null_setcursor,		/* define cursor	*/
+    null_cursor,		/* set cursor		*/
+    null_getcursor,		/* get cursor		*/
+    null_readrect,		/* rectangle read	*/
+    null_writerect,		/* rectangle write	*/
+    null_readrect,		/* bw rectangle read	*/
+    null_writerect,		/* bw rectangle write	*/
+    null_poll,		/* handle events	*/
+    null_flush,		/* flush output		*/
+    null_free,		/* free resources	*/
+    null_help,		/* help message		*/
+    "Null Device",		/* device description	*/
+    32*1024,		/* max width		*/
+    32*1024,		/* max height		*/
+    "/dev/null",		/* short device name	*/
+    512,			/* default/current width  */
+    512,			/* default/current height */
+    -1,			/* select fd		*/
+    -1,			/* file descriptor	*/
+    1, 1,			/* zoom			*/
+    256, 256,		/* window center	*/
+    0, 0, 0,		/* cursor		*/
+    PIXEL_NULL,		/* page_base		*/
+    PIXEL_NULL,		/* page_curp		*/
+    PIXEL_NULL,		/* page_endp		*/
+    -1,			/* page_no		*/
+    0,			/* page_dirty		*/
+    0L,			/* page_curpos		*/
+    0L,			/* page_pixels		*/
+    0			/* debug		*/
+};
+
 /*
  * Local Variables:
  * mode: C

Modified: brlcad/trunk/src/libfb/if_remote.c
===================================================================
--- brlcad/trunk/src/libfb/if_remote.c	2009-12-14 23:49:39 UTC (rev 36905)
+++ brlcad/trunk/src/libfb/if_remote.c	2009-12-15 00:00:56 UTC (rev 36906)
@@ -71,73 +71,7 @@
     { 0, NULL, NULL }
 };
 
-HIDDEN int rem_open(register FBIO *ifp, register char *file, int width, int height),
-    rem_close(FBIO *ifp),
-    rem_clear(FBIO *ifp, unsigned char *bgpp),
-    rem_read(register FBIO *ifp, int x, int y, unsigned char *pixelp, int num),
-    rem_write(register FBIO *ifp, int x, int y, const unsigned char *pixelp, int num),
-    rem_rmap(register FBIO *ifp, register ColorMap *cmap),
-    rem_wmap(register FBIO *ifp, const ColorMap *cmap),
-    rem_view(FBIO *ifp, int xcenter, int ycenter, int xzoom, int yzoom),
-    rem_getview(FBIO *ifp, int *xcenter, int *ycenter, int *xzoom, int *yzoom),
-    rem_cursor(FBIO *ifp, int mode, int x, int y),
-    rem_getcursor(FBIO *ifp, int *mode, int *x, int *y),
-    rem_setcursor(FBIO *ifp, const unsigned char *bits, int xbits, int ybits, int xorig, int yorig),
-    rem_readrect(FBIO *ifp, int xmin, int ymin, int width, int height, unsigned char *pp),
-    rem_writerect(FBIO *ifp, int xmin, int ymin, int width, int height, const unsigned char *pp),
-    rem_bwreadrect(FBIO *ifp, int xmin, int ymin, int width, int height, unsigned char *pp),
-    rem_bwwriterect(FBIO *ifp, int xmin, int ymin, int width, int height, const unsigned char *pp),
-    rem_poll(FBIO *ifp),
-    rem_flush(FBIO *ifp),
-    rem_free(FBIO *ifp),
-    rem_help(FBIO *ifp);
 
-FBIO remote_interface = {
-    0,
-    rem_open,
-    rem_close,
-    rem_clear,
-    rem_read,
-    rem_write,
-    rem_rmap,
-    rem_wmap,
-    rem_view,
-    rem_getview,
-    rem_setcursor,
-    rem_cursor,
-    rem_getcursor,
-    rem_readrect,
-    rem_writerect,
-    rem_bwreadrect,
-    rem_bwwriterect,
-    rem_poll,
-    rem_flush,
-    rem_free,
-    rem_help,
-    "Remote Device Interface",	/* should be filled in */
-    32*1024,			/* " */
-    32*1024,			/* " */
-    "host:[dev]",
-    512,
-    512,
-    -1,				/* select fd */
-    -1,
-    1, 1,			/* zoom */
-    256, 256,			/* window center */
-    0, 0, 0,			/* cursor */
-    PIXEL_NULL,
-    PIXEL_NULL,
-    PIXEL_NULL,
-    -1,
-    0,
-    0L,
-    0L,
-    0
-};
-
-void pkg_queue(), flush_queue();
-
-
 /* True if the non-null string s is all digits */
 HIDDEN int
 numeric(register char *s)
@@ -820,6 +754,49 @@
     free(buf);
 }
 
+FBIO remote_interface = {
+    0,
+    rem_open,
+    rem_close,
+    rem_clear,
+    rem_read,
+    rem_write,
+    rem_rmap,
+    rem_wmap,
+    rem_view,
+    rem_getview,
+    rem_setcursor,
+    rem_cursor,
+    rem_getcursor,
+    rem_readrect,
+    rem_writerect,
+    rem_bwreadrect,
+    rem_bwwriterect,
+    rem_poll,
+    rem_flush,
+    rem_free,
+    rem_help,
+    "Remote Device Interface",	/* should be filled in */
+    32*1024,			/* " */
+    32*1024,			/* " */
+    "host:[dev]",
+    512,
+    512,
+    -1,				/* select fd */
+    -1,
+    1, 1,			/* zoom */
+    256, 256,			/* window center */
+    0, 0, 0,			/* cursor */
+    PIXEL_NULL,
+    PIXEL_NULL,
+    PIXEL_NULL,
+    -1,
+    0,
+    0L,
+    0L,
+    0
+};
+
 /*
  * Local Variables:
  * mode: C

Modified: brlcad/trunk/src/libfb/if_stack.c
===================================================================
--- brlcad/trunk/src/libfb/if_stack.c	2009-12-14 23:49:39 UTC (rev 36905)
+++ brlcad/trunk/src/libfb/if_stack.c	2009-12-15 00:00:56 UTC (rev 36906)
@@ -38,72 +38,6 @@
 #include "fb.h"
 
 
-HIDDEN int	stk_open(FBIO *ifp, char *file, int width, int height),
-    stk_close(FBIO *ifp),
-    stk_clear(FBIO *ifp, unsigned char *pp),
-    stk_read(FBIO *ifp, int x, int y, unsigned char *pixelp, int count),
-    stk_write(FBIO *ifp, int x, int y, const unsigned char *pixelp, int count),
-    stk_rmap(FBIO *ifp, ColorMap *cmp),
-    stk_wmap(FBIO *ifp, const ColorMap *cmp),
-    stk_view(FBIO *ifp, int xcenter, int ycenter, int xzoom, int yzoom),
-    stk_getview(FBIO *ifp, int *xcenter, int *ycenter, int *xzoom, int *yzoom),
-    stk_setcursor(FBIO *ifp, const unsigned char *bits, int xbits, int ybits, int xorig, int yorig),
-    stk_cursor(FBIO *ifp, int mode, int x, int y),
-    stk_getcursor(FBIO *ifp, int *mode, int *x, int *y),
-    stk_readrect(FBIO *ifp, int xmin, int ymin, int width, int height, unsigned char *pp),
-    stk_writerect(FBIO *ifp, int xmin, int ymin, int width, int height, const unsigned char *pp),
-    stk_bwreadrect(FBIO *ifp, int xmin, int ymin, int width, int height, unsigned char *pp),
-    stk_bwwriterect(FBIO *ifp, int xmin, int ymin, int width, int height, const unsigned char *pp),
-    stk_poll(FBIO *ifp),
-    stk_flush(FBIO *ifp),
-    stk_free(FBIO *ifp),
-    stk_help(FBIO *ifp);
-
-
-/* This is the ONLY thing that we normally "export" */
-FBIO stk_interface =  {
-    0,
-    stk_open,		/* device_open		*/
-    stk_close,		/* device_close		*/
-    stk_clear,		/* device_clear		*/
-    stk_read,		/* buffer_read		*/
-    stk_write,		/* buffer_write		*/
-    stk_rmap,		/* colormap_read	*/
-    stk_wmap,		/* colormap_write	*/
-    stk_view,		/* set view		*/
-    stk_getview,		/* get view		*/
-    stk_setcursor,		/* define cursor	*/
-    stk_cursor,		/* set cursor		*/
-    stk_getcursor,		/* get cursor		*/
-    stk_readrect,		/* read rectangle	*/
-    stk_writerect,		/* write rectangle	*/
-    stk_bwreadrect,		/* read bw rectangle	*/
-    stk_bwwriterect,	/* write bw rectangle	*/
-    stk_poll,		/* handle events	*/
-    stk_flush,		/* flush output		*/
-    stk_free,		/* free resources	*/
-    stk_help,		/* help function	*/
-    "Multiple Device Stacker", /* device description */
-    32*1024,		/* max width		*/
-    32*1024,		/* max height		*/
-    "/dev/stack",		/* short device name	*/
-    4,			/* default/current width  */
-    4,			/* default/current height */
-    -1,			/* select fd		*/
-    -1,			/* file descriptor	*/
-    1, 1,			/* zoom			*/
-    2, 2,			/* window center	*/
-    0, 0, 0,		/* cursor		*/
-    PIXEL_NULL,		/* page_base		*/
-    PIXEL_NULL,		/* page_curp		*/
-    PIXEL_NULL,		/* page_endp		*/
-    -1,			/* page_no		*/
-    0,			/* page_dirty		*/
-    0L,			/* page_curpos		*/
-    0L,			/* page_pixels		*/
-    0			/* debug		*/
-};
-
 /* List of interface struct pointers, one per dev */
 #define	MAXIF	32
 struct	stkinfo {
@@ -447,6 +381,50 @@
     return(0);
 }
 
+/* This is the ONLY thing that we normally "export" */
+FBIO stk_interface =  {
+    0,
+    stk_open,		/* device_open		*/
+    stk_close,		/* device_close		*/
+    stk_clear,		/* device_clear		*/
+    stk_read,		/* buffer_read		*/
+    stk_write,		/* buffer_write		*/
+    stk_rmap,		/* colormap_read	*/
+    stk_wmap,		/* colormap_write	*/
+    stk_view,		/* set view		*/
+    stk_getview,		/* get view		*/
+    stk_setcursor,		/* define cursor	*/
+    stk_cursor,		/* set cursor		*/
+    stk_getcursor,		/* get cursor		*/
+    stk_readrect,		/* read rectangle	*/
+    stk_writerect,		/* write rectangle	*/
+    stk_bwreadrect,		/* read bw rectangle	*/
+    stk_bwwriterect,	/* write bw rectangle	*/
+    stk_poll,		/* handle events	*/
+    stk_flush,		/* flush output		*/
+    stk_free,		/* free resources	*/
+    stk_help,		/* help function	*/
+    "Multiple Device Stacker", /* device description */
+    32*1024,		/* max width		*/
+    32*1024,		/* max height		*/
+    "/dev/stack",		/* short device name	*/
+    4,			/* default/current width  */
+    4,			/* default/current height */
+    -1,			/* select fd		*/
+    -1,			/* file descriptor	*/
+    1, 1,			/* zoom			*/
+    2, 2,			/* window center	*/
+    0, 0, 0,		/* cursor		*/
+    PIXEL_NULL,		/* page_base		*/
+    PIXEL_NULL,		/* page_curp		*/
+    PIXEL_NULL,		/* page_endp		*/
+    -1,			/* page_no		*/
+    0,			/* page_dirty		*/
+    0L,			/* page_curpos		*/
+    0L,			/* page_pixels		*/
+    0			/* debug		*/
+};
+
 /*
  * Local Variables:
  * mode: C


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.