From owner-svn-src-projects@FreeBSD.ORG Wed Nov 16 22:14:13 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C11C1065670; Wed, 16 Nov 2011 22:14:13 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5C0868FC14; Wed, 16 Nov 2011 22:14:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAGMEDMG069025; Wed, 16 Nov 2011 22:14:13 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAGMEDk4069023; Wed, 16 Nov 2011 22:14:13 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <201111162214.pAGMEDk4069023@svn.freebsd.org> From: "David E. O'Brien" Date: Wed, 16 Nov 2011 22:14:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r227592 - projects/jbuild/usr.bin/jbuild/filemon X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Nov 2011 22:14:13 -0000 Author: obrien Date: Wed Nov 16 22:14:13 2011 New Revision: 227592 URL: http://svn.freebsd.org/changeset/base/227592 Log: Additional 8.x compatibility. Modified: projects/jbuild/usr.bin/jbuild/filemon/filemon_wrapper.c Modified: projects/jbuild/usr.bin/jbuild/filemon/filemon_wrapper.c ============================================================================== --- projects/jbuild/usr.bin/jbuild/filemon/filemon_wrapper.c Wed Nov 16 22:09:14 2011 (r227591) +++ projects/jbuild/usr.bin/jbuild/filemon/filemon_wrapper.c Wed Nov 16 22:14:13 2011 (r227592) @@ -28,16 +28,22 @@ #include __FBSDID("$FreeBSD$"); +#if __FreeBSD_version > 800032 +#define FILEMON_HAS_LINKAT +#endif + #if __FreeBSD_version < 900044 /* r225617 (2011-09-16) failed to bump __FreeBSD_version. This really should be based on "900045". "900044" is r225469 (2011-09-10) so this code is broken for 9-CURRENT September 10th-16th. */ #define sys_chdir chdir +#define sys_execve execve #define sys_fork fork #define sys_link link #define sys_open open #define sys_rename rename +#define sys_stat stat #define sys_symlink symlink #define sys_unlink unlink #define sys_vfork vfork @@ -422,10 +428,6 @@ filemon_wrapper_symlink(struct thread *t return (ret); } -#if __FreeBSD_version > 800032 -#define FILEMON_HAS_LINKAT -#endif - #ifdef FILEMON_HAS_LINKAT static int filemon_wrapper_linkat(struct thread *td, struct linkat_args *uap)