From owner-svn-src-head@FreeBSD.ORG Fri Aug 22 20:04:53 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2E9793F8; Fri, 22 Aug 2014 20:04:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 171073E67; Fri, 22 Aug 2014 20:04:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7MK4qSg035033; Fri, 22 Aug 2014 20:04:52 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7MK4pEa035023; Fri, 22 Aug 2014 20:04:51 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201408222004.s7MK4pEa035023@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 22 Aug 2014 20:04:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270358 - in head/cddl: . contrib/opensolaris/lib/libdtrace/common contrib/opensolaris/lib/libgen/common lib/libdtrace usr.sbin/lockstat X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Aug 2014 20:04:53 -0000 Author: delphij Date: Fri Aug 22 20:04:51 2014 New Revision: 270358 URL: http://svnweb.freebsd.org/changeset/base/270358 Log: Make DTrace stuff compile with C99 standard. Modified: head/cddl/Makefile.inc head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c head/cddl/contrib/opensolaris/lib/libgen/common/gmatch.c head/cddl/lib/libdtrace/libproc_compat.h head/cddl/usr.sbin/lockstat/Makefile Modified: head/cddl/Makefile.inc ============================================================================== --- head/cddl/Makefile.inc Fri Aug 22 20:01:35 2014 (r270357) +++ head/cddl/Makefile.inc Fri Aug 22 20:04:51 2014 (r270358) @@ -8,7 +8,6 @@ IGNORE_PRAGMA= YES CFLAGS+= -DNEED_SOLARIS_BOOLEAN WARNS?= 6 -CSTD?= gnu89 # Do not lint the CDDL stuff. It is all externally maintained and # lint output is wasteful noise here. Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h ============================================================================== --- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h Fri Aug 22 20:01:35 2014 (r270357) +++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h Fri Aug 22 20:04:51 2014 (r270358) @@ -723,6 +723,11 @@ extern int _dtrace_argmax; /* default m extern const char *_dtrace_libdir; /* default library directory */ extern const char *_dtrace_moddir; /* default kernel module directory */ +#ifdef __FreeBSD__ +extern int gmatch(const char *, const char *); +extern int yylex(void); +#endif + #ifdef __cplusplus } #endif Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c ============================================================================== --- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Fri Aug 22 20:01:35 2014 (r270357) +++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Fri Aug 22 20:04:51 2014 (r270358) @@ -29,6 +29,11 @@ #if defined(sun) #include #include +#else +/* FreeBSD */ +#include +#include +#include #endif #include Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c ============================================================================== --- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c Fri Aug 22 20:01:35 2014 (r270357) +++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c Fri Aug 22 20:04:51 2014 (r270358) @@ -36,6 +36,7 @@ #include #include +#include #include #include Modified: head/cddl/contrib/opensolaris/lib/libgen/common/gmatch.c ============================================================================== --- head/cddl/contrib/opensolaris/lib/libgen/common/gmatch.c Fri Aug 22 20:01:35 2014 (r270357) +++ head/cddl/contrib/opensolaris/lib/libgen/common/gmatch.c Fri Aug 22 20:04:51 2014 (r270358) @@ -42,6 +42,7 @@ #include #include "_range.h" #else +#include /* DOODAD */ static int multibyte = 0; #define WCHAR_CSMASK 0x30000000 #define valid_range(c1, c2) \ Modified: head/cddl/lib/libdtrace/libproc_compat.h ============================================================================== --- head/cddl/lib/libdtrace/libproc_compat.h Fri Aug 22 20:01:35 2014 (r270357) +++ head/cddl/lib/libdtrace/libproc_compat.h Fri Aug 22 20:04:51 2014 (r270358) @@ -43,6 +43,7 @@ #define Pcreate_error strerror #define Pdelbkpt proc_bkptdel #define Pgrab_error strerror +#define Plmid(p, a, l) (-1) #define Plmid_to_map(p, l, o) proc_obj2map((p), (o)) #define Plookup_by_addr proc_addr2sym #define Pname_to_ctf(p, obj) NULL Modified: head/cddl/usr.sbin/lockstat/Makefile ============================================================================== --- head/cddl/usr.sbin/lockstat/Makefile Fri Aug 22 20:01:35 2014 (r270357) +++ head/cddl/usr.sbin/lockstat/Makefile Fri Aug 22 20:04:51 2014 (r270358) @@ -18,7 +18,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ -I${.CURDIR}/../../../sys CFLAGS+= -DNEED_ERRLOC -g -CSTD?= gnu99 #YFLAGS+= -d