capi20_wait_for_message will now return CapiReceiveQueueEmpty on
timeout and error.
This commit is contained in:
parent
2f2659ddb5
commit
d4138ae341
|
@ -9,7 +9,7 @@ include_HEADERS = capi20.h capiutils.h
|
||||||
lib_LTLIBRARIES = libcapi20.la
|
lib_LTLIBRARIES = libcapi20.la
|
||||||
|
|
||||||
libcapi20_la_SOURCES = capi20.c capifunc.c convert.c
|
libcapi20_la_SOURCES = capi20.c capifunc.c convert.c
|
||||||
libcapi20_la_LDFLAGS = -version-info 2:3:0
|
libcapi20_la_LDFLAGS = -version-info 2:4:0
|
||||||
# libcapi20_la_LIBADD = $(LIBADD_DL)
|
# libcapi20_la_LIBADD = $(LIBADD_DL)
|
||||||
|
|
||||||
$(OBJECTS): libtool
|
$(OBJECTS): libtool
|
||||||
|
|
|
@ -80,7 +80,7 @@ include_HEADERS = capi20.h capiutils.h
|
||||||
lib_LTLIBRARIES = libcapi20.la
|
lib_LTLIBRARIES = libcapi20.la
|
||||||
|
|
||||||
libcapi20_la_SOURCES = capi20.c capifunc.c convert.c
|
libcapi20_la_SOURCES = capi20.c capifunc.c convert.c
|
||||||
libcapi20_la_LDFLAGS = -version-info 2:3:0
|
libcapi20_la_LDFLAGS = -version-info 2:4:0
|
||||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||||
CONFIG_CLEAN_FILES =
|
CONFIG_CLEAN_FILES =
|
||||||
|
|
|
@ -2,6 +2,9 @@
|
||||||
* $Id$
|
* $Id$
|
||||||
*
|
*
|
||||||
* $Log$
|
* $Log$
|
||||||
|
* Revision 1.14 2000/04/07 16:06:09 calle
|
||||||
|
* Bugfix: without devfs open where without NONBLOCK, ahhh.
|
||||||
|
*
|
||||||
* Revision 1.13 2000/04/03 14:27:15 calle
|
* Revision 1.13 2000/04/03 14:27:15 calle
|
||||||
* non CAPI2.0 standard functions now named capi20ext not capi20.
|
* non CAPI2.0 standard functions now named capi20ext not capi20.
|
||||||
* Extentionfunctions will work with actual driver version.
|
* Extentionfunctions will work with actual driver version.
|
||||||
|
@ -397,7 +400,6 @@ capi20_waitformessage(unsigned ApplID, struct timeval *TimeOut)
|
||||||
{
|
{
|
||||||
int fd;
|
int fd;
|
||||||
fd_set rfds;
|
fd_set rfds;
|
||||||
int retval;
|
|
||||||
|
|
||||||
FD_ZERO(&rfds);
|
FD_ZERO(&rfds);
|
||||||
|
|
||||||
|
@ -411,7 +413,8 @@ capi20_waitformessage(unsigned ApplID, struct timeval *TimeOut)
|
||||||
|
|
||||||
FD_SET(fd, &rfds);
|
FD_SET(fd, &rfds);
|
||||||
|
|
||||||
retval = select(fd + 1, &rfds, NULL, NULL, TimeOut);
|
if (select(fd + 1, &rfds, NULL, NULL, TimeOut) < 1)
|
||||||
|
return CapiReceiveQueueEmpty;
|
||||||
|
|
||||||
return CapiNoError;
|
return CapiNoError;
|
||||||
}
|
}
|
||||||
|
|
|
@ -702,7 +702,7 @@ fi
|
||||||
|
|
||||||
PACKAGE=libcapi20
|
PACKAGE=libcapi20
|
||||||
|
|
||||||
VERSION=2.0.3
|
VERSION=2.0.4
|
||||||
|
|
||||||
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
|
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
|
||||||
{ echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
|
{ echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
dnl Process this file with autoconf to produce a configure script.
|
dnl Process this file with autoconf to produce a configure script.
|
||||||
|
|
||||||
AC_INIT(capi20.c)
|
AC_INIT(capi20.c)
|
||||||
AM_INIT_AUTOMAKE(libcapi20,2.0.3)
|
AM_INIT_AUTOMAKE(libcapi20,2.0.4)
|
||||||
AC_PREFIX_DEFAULT(/usr)
|
AC_PREFIX_DEFAULT(/usr)
|
||||||
|
|
||||||
dnl Checks for programs.
|
dnl Checks for programs.
|
||||||
|
|
Loading…
Reference in New Issue