diff options
| author | Steven Hartland <smh@FreeBSD.org> | 2015-01-17 14:44:59 +0000 |
|---|---|---|
| committer | Steven Hartland <smh@FreeBSD.org> | 2015-01-17 14:44:59 +0000 |
| commit | bc96366c864c07ef352edb92017357917c75b36c (patch) | |
| tree | 09e9633064b6303a8afc6891fff761eb6e399cee /cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l | |
| parent | b0b74fb366450ac61b7df38daa92bc19cbfc3ecc (diff) | |
| download | src-bc96366c864c07ef352edb92017357917c75b36c.tar.gz src-bc96366c864c07ef352edb92017357917c75b36c.zip | |
Mechanically convert cddl sun #ifdef's to illumos
Since the upstream for cddl code is now illumos not sun, mechanically
convert all sun #ifdef's to illumos #ifdef's which have been used in all
newer code for some time.
Also do a manual pass to correct the use if #ifdef comments as per style(9)
as well as few uses of #if defined(__FreeBSD__) vs #ifndef illumos.
MFC after: 1 month
Sponsored by: Multiplay
Notes
Notes:
svn path=/head/; revision=277300
Diffstat (limited to 'cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l')
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l index 032d3034d67a..925f8a5875e9 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l @@ -44,7 +44,7 @@ * We need to undefine lex's input and unput macros so that references to these * call the functions provided at the end of this source file. */ -#if defined(sun) +#ifdef illumos #undef input #undef unput #else @@ -79,7 +79,7 @@ #endif static int id_or_type(const char *); -#if defined(sun) +#ifdef illumos static int input(void); static void unput(int); #endif @@ -740,7 +740,7 @@ yyinit(dt_pcb_t *pcb) yypcb = pcb; yylineno = 1; yypragma = NULL; -#if defined(sun) +#ifdef illumos yysptr = yysbuf; #endif } @@ -838,7 +838,7 @@ id_or_type(const char *s) return (ttok); } -#if defined(sun) +#ifdef illumos static int input(void) { @@ -880,4 +880,4 @@ unput(int c) *yysptr++ = c; yytchar = c; } -#endif +#endif /* illumos */ |