~ubuntu-branches/ubuntu/jaunty/pcsc-lite/jaunty-security

« back to all changes in this revision

Viewing changes to src/sys_unix.c

Committer: Bazaar Package Importer
Author(s): Ludovic Rousseau
Date: 2007-05-16 14:40:30 UTC
mto: This revision was merged to the branch mainline in revision 9.
Revision ID: james.westby@ubuntu.com-20070516144030-6wk53ou910ctb9ds

Tags: upstream-1.4.1

Import upstream version 1.4.1

files added:
src/utils.c

src/utils.h

files removed:
doc/ifdhandler-3.pdf

doc/pcsc-lite.pdf

files modified:
ChangeLog

ChangeLog.svn

TODO

config.guess

config.h.in

config.sub

configure

configure.in

doc/Makefile.am

doc/Makefile.in

doc/example/pcsc_demo.c

doc/ifdhandler-3.tex

doc/pcsc-lite.tex

src/Makefile.am

src/Makefile.in

src/PCSC/debuglog.h

src/PCSC/ifdhandler.h

src/PCSC/pcsclite.h

src/PCSC/pcsclite.h.in

src/PCSC/reader.h.in

src/PCSC/winscard.h

src/PCSC/wintypes.h

src/debug.c

src/debug.h

src/debuglog.c

src/dyn_win32.c

src/error.c

src/eventhandler.c

src/hotplug_libusb.c

src/hotplug_linux.c

src/hotplug_macosx.c

src/misc.h

src/parser.h

src/pcscd.h

src/pcscd.h.in

src/pcscdaemon.c

src/powermgt_generic.c

src/powermgt_macosx.c

src/strlcpycat.h

src/sys_unix.c

src/testpcsc.c

src/thread_win32.c

src/winscard.c

src/winscard_clnt.c

src/winscard_msg.c

src/winscard_msg_srv.c

src/winscard_scf.c

src/winscard_svc.c

win32/PCSC.cpp *

win32/PCSC.h *

win32/StdAfx.cpp *

win32/StdAfx.h *

win32/config.h *

win32/pthread.h *

win32/sched.h *

Show diffs side-by-side

added added

removed removed

src/sys_unix.c

* David Corcoran <corcoran@linuxnet.com>

* $Id: sys_unix.c 2353 2007-01-23 10:31:50Z rousseau $

* $Id: sys_unix.c 2403 2007-02-19 09:16:29Z rousseau $

/**

105

106

return nanosleep(&mrqtp, NULL);

107

#else

108

usleep(iTimeVal);

109

return iTimeVal;

108

struct timeval tv;

109

tv.tv_sec = iTimeVal/1000000;

110

tv.tv_usec = iTimeVal - (tv.tv_sec * 1000000);

111

return select(0, NULL, NULL, NULL, &tv);

110

112

#endif

111

113

}

112

114

Older »