svn commit: r250914 - head/sbin/hastd

[Jung-uk Kim]

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