Date: Thu, 16 May 2013 00:18:25 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r250688 - in projects/flex-sf: contrib/flex usr.bin/lex Message-ID: <201305160018.r4G0IPZI070850@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Thu May 16 00:18:25 2013 New Revision: 250688 URL: http://svnweb.freebsd.org/changeset/base/250688 Log: Always include stdint.h to work around broken flexint.h and regen. Modified: projects/flex-sf/contrib/flex/flex.skl projects/flex-sf/contrib/flex/flexint.h projects/flex-sf/usr.bin/lex/initscan.c projects/flex-sf/usr.bin/lex/initskel.c Modified: projects/flex-sf/contrib/flex/flex.skl ============================================================================== --- projects/flex-sf/contrib/flex/flex.skl Wed May 15 23:11:08 2013 (r250687) +++ projects/flex-sf/contrib/flex/flex.skl Thu May 16 00:18:25 2013 (r250688) @@ -200,15 +200,13 @@ m4_ifdef( [[M4_YY_TABLES_EXTERNAL]], #define __STDC_LIMIT_MACROS #endif #include <sys/cdefs.h> +#include <stdint.h> #else #define __dead2 #endif /* begin standard C headers. */ %if-c-only -#if defined(__FreeBSD__) -#include <stdint.h> -#endif #include <stdio.h> #include <string.h> #include <errno.h> Modified: projects/flex-sf/contrib/flex/flexint.h ============================================================================== --- projects/flex-sf/contrib/flex/flexint.h Wed May 15 23:11:08 2013 (r250687) +++ projects/flex-sf/contrib/flex/flexint.h Thu May 16 00:18:25 2013 (r250688) @@ -5,7 +5,8 @@ /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L +#if defined(__FreeBSD__) || \ + (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, * if you want the limit (max/min) macros for int types. Modified: projects/flex-sf/usr.bin/lex/initscan.c ============================================================================== --- projects/flex-sf/usr.bin/lex/initscan.c Wed May 15 23:11:08 2013 (r250687) +++ projects/flex-sf/usr.bin/lex/initscan.c Thu May 16 00:18:25 2013 (r250688) @@ -21,14 +21,12 @@ #define __STDC_LIMIT_MACROS #endif #include <sys/cdefs.h> +#include <stdint.h> #else #define __dead2 #endif /* begin standard C headers. */ -#if defined(__FreeBSD__) -#include <stdint.h> -#endif #include <stdio.h> #include <string.h> #include <errno.h> @@ -43,7 +41,8 @@ /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L +#if defined(__FreeBSD__) || \ + (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, * if you want the limit (max/min) macros for int types. @@ -1988,7 +1987,7 @@ extern const char *escaped_qstart, *esca -#line 1991 "<stdout>" +#line 1990 "<stdout>" #define INITIAL 0 #define SECT2 1 @@ -2217,7 +2216,7 @@ YY_DECL Char nmdef[MAXLINE]; -#line 2220 "<stdout>" +#line 2219 "<stdout>" if ( !(yy_init) ) { @@ -4125,7 +4124,7 @@ YY_RULE_SETUP #line 969 "scan.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 4128 "<stdout>" +#line 4127 "<stdout>" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(SECT2): case YY_STATE_EOF(CODEBLOCK): Modified: projects/flex-sf/usr.bin/lex/initskel.c ============================================================================== --- projects/flex-sf/usr.bin/lex/initskel.c Wed May 15 23:11:08 2013 (r250687) +++ projects/flex-sf/usr.bin/lex/initskel.c Thu May 16 00:18:25 2013 (r250688) @@ -205,15 +205,13 @@ const char *skel[] = { "#define __STDC_LIMIT_MACROS", "#endif", "#include <sys/cdefs.h>", + "#include <stdint.h>", "#else", "#define __dead2", "#endif", "", "/* begin standard C headers. */", "%if-c-only", - "#if defined(__FreeBSD__)", - "#include <stdint.h>", - "#endif", "#include <stdio.h>", "#include <string.h>", "#include <errno.h>", @@ -234,7 +232,8 @@ const char *skel[] = { "", "/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */", "", - "#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L", + "#if defined(__FreeBSD__) || \\", + " (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)", "", "/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,", " * if you want the limit (max/min) macros for int types. ",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305160018.r4G0IPZI070850>