From owner-svn-src-head@FreeBSD.ORG  Wed May 22 17:47:46 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id B8C11DAF;
 Wed, 22 May 2013 17:47:46 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id AA88C992;
 Wed, 22 May 2013 17:47:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4MHlkJ1094570;
 Wed, 22 May 2013 17:47:46 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4MHlkMD094567;
 Wed, 22 May 2013 17:47:46 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201305221747.r4MHlkMD094567@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Wed, 22 May 2013 17:47:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r250914 - head/sbin/hastd
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.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 May 2013 17:47:46 -0000

Author: jkim
Date: Wed May 22 17:47:45 2013
New Revision: 250914
URL: http://svnweb.freebsd.org/changeset/base/250914

Log:
  Improve compatibility with old flex and fix build with GCC.

Modified:
  head/sbin/hastd/hast.h
  head/sbin/hastd/parse.y
  head/sbin/hastd/token.l

Modified: head/sbin/hastd/hast.h
==============================================================================
--- head/sbin/hastd/hast.h	Wed May 22 17:13:03 2013	(r250913)
+++ head/sbin/hastd/hast.h	Wed May 22 17:47:45 2013	(r250914)
@@ -259,7 +259,4 @@ struct hast_resource {
 struct hastd_config *yy_config_parse(const char *config, bool exitonerror);
 void yy_config_free(struct hastd_config *config);
 
-void yyerror(const char *);
-int yylex(void);
-
 #endif	/* !_HAST_H_ */

Modified: head/sbin/hastd/parse.y
==============================================================================
--- head/sbin/hastd/parse.y	Wed May 22 17:13:03 2013	(r250913)
+++ head/sbin/hastd/parse.y	Wed May 22 17:47:45 2013	(r250914)
@@ -75,6 +75,8 @@ static char depth1_provname[PATH_MAX];
 static char depth1_localpath[PATH_MAX];
 static int depth1_metaflush;
 
+extern void yyerror(const char *);
+extern int yylex(void);
 extern void yyrestart(FILE *);
 
 static int isitme(const char *name);

Modified: head/sbin/hastd/token.l
==============================================================================
--- head/sbin/hastd/token.l	Wed May 22 17:13:03 2013	(r250913)
+++ head/sbin/hastd/token.l	Wed May 22 17:47:45 2013	(r250914)
@@ -42,6 +42,9 @@ int depth;
 int lineno;
 
 #define	DP	do { } while (0)
+#define	YY_DECL	int yylex(void)
+
+extern int yylex(void);
 %}
 
 %option noinput