From c4c0f87fce0966c7714cdf872e1a52a86a50ca3a Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Thu, 18 Jul 2002 06:07:25 +0000 Subject: XMakefile (w3mimg/w3mimg): added (w3img/fb) fixed * w3mimg/w3mimg.h (w3mimg_open): deleted to avoid compilation warnings * w3mimg/w3mimg.c: added * configure (imgobjs): add w3mimg/w3mimg.o From: Fumitoshi UKAI --- w3mimg/w3mimg.c | 17 +++++++++++++++++ w3mimg/w3mimg.h | 19 ++++--------------- 2 files changed, 21 insertions(+), 15 deletions(-) create mode 100644 w3mimg/w3mimg.c (limited to 'w3mimg') diff --git a/w3mimg/w3mimg.c b/w3mimg/w3mimg.c new file mode 100644 index 0000000..a898187 --- /dev/null +++ b/w3mimg/w3mimg.c @@ -0,0 +1,17 @@ +/* $Id: w3mimg.c,v 1.1 2002/07/18 06:07:39 ukai Exp $ */ + +#include "w3mimg/w3mimg.h" + +w3mimg_op *w3mimg_open() { + w3mimg_op *w_op = NULL; +#ifdef USE_W3MIMG_X11 + if (w_op == NULL) + w_op = w3mimg_x11open(); +#endif +#ifdef USE_W3MIMG_FB + if (w_op == NULL) + w_op = w3mimg_fbopen(); +#endif + return w_op; +} + diff --git a/w3mimg/w3mimg.h b/w3mimg/w3mimg.h index 086b1d5..eb89eda 100644 --- a/w3mimg/w3mimg.h +++ b/w3mimg/w3mimg.h @@ -1,4 +1,4 @@ -/* $Id: w3mimg.h,v 1.1 2002/07/17 20:58:48 ukai Exp $ */ +/* $Id: w3mimg.h,v 1.2 2002/07/18 06:07:25 ukai Exp $ */ #include "config.h" #ifdef USE_W3MIMG_FB @@ -32,21 +32,10 @@ typedef struct _w3mimg_op { } w3mimg_op; #ifdef USE_W3MIMG_X11 -w3mimg_op *w3mimg_x11open(); +extern w3mimg_op *w3mimg_x11open(); #endif #ifdef USE_W3MIMG_FB -w3mimg_op *w3mimg_fbopen(); +extern w3mimg_op *w3mimg_fbopen(); #endif -static w3mimg_op *w3mimg_open() { - w3mimg_op *w_op = NULL; -#ifdef USE_W3MIMG_X11 - if (w_op == NULL) - w_op = w3mimg_x11open(); -#endif -#ifdef USE_W3MIMG_FB - if (w_op == NULL) - w_op = w3mimg_fbopen(); -#endif - return w_op; -} +extern w3mimg_op *w3mimg_open(); -- cgit v1.2.3