Date: Mon, 9 Mar 2009 02:34:02 +0000 (UTC) From: David Xu <davidxu@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r189549 - in head/lib/libthr: . thread Message-ID: <200903090234.n292Y2aC006913@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: davidxu Date: Mon Mar 9 02:34:02 2009 New Revision: 189549 URL: http://svn.freebsd.org/changeset/base/189549 Log: Don't reference non-existent __fcntl_compat if WITHOUT_SYSCALL_COMPAT is defined. Submitted by: Pawel Worach "pawel dot worach at gmail dot com" Modified: head/lib/libthr/Makefile head/lib/libthr/thread/thr_syscalls.c Modified: head/lib/libthr/Makefile ============================================================================== --- head/lib/libthr/Makefile Sun Mar 8 23:45:56 2009 (r189548) +++ head/lib/libthr/Makefile Mon Mar 9 02:34:02 2009 (r189549) @@ -51,4 +51,8 @@ SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthr SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a .endif +.if !defined(WITHOUT_SYSCALL_COMPAT) +CFLAGS+=-DSYSCALL_COMPAT +.endif + .include <bsd.lib.mk> Modified: head/lib/libthr/thread/thr_syscalls.c ============================================================================== --- head/lib/libthr/thread/thr_syscalls.c Sun Mar 8 23:45:56 2009 (r189548) +++ head/lib/libthr/thread/thr_syscalls.c Mon Mar 9 02:34:02 2009 (r189549) @@ -132,7 +132,9 @@ int __aio_suspend(const struct aiocb * c int __close(int); int __connect(int, const struct sockaddr *, socklen_t); int __fcntl(int, int,...); +#ifdef SYSCALL_COMPAT extern int __fcntl_compat(int, int,...); +#endif int __fsync(int); int __msync(void *, size_t, int); int __nanosleep(const struct timespec *, struct timespec *); @@ -253,7 +255,11 @@ __fcntl(int fd, int cmd,...) ret = __sys_fcntl(fd, cmd); break; default: +#ifdef SYSCALL_COMPAT ret = __fcntl_compat(fd, cmd, va_arg(ap, void *)); +#else + ret = EOPNOTSUPP; +#endif } va_end(ap);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903090234.n292Y2aC006913>