don't need sys/cdefs.h if tool.diff -r1.3 -r1.4 src/external/bsd/flex/dist/src/libmain.c
(christos)
--- src/external/bsd/flex/dist/src/libmain.c 2017/01/02 17:45:27 1.3
+++ src/external/bsd/flex/dist/src/libmain.c 2018/03/11 18:32:10 1.4
@@ -1,40 +1,42 @@ | @@ -1,40 +1,42 @@ | |||
1 | /* $NetBSD: libmain.c,v 1.3 2017/01/02 17:45:27 christos Exp $ */ | 1 | /* $NetBSD: libmain.c,v 1.4 2018/03/11 18:32:10 christos Exp $ */ | |
2 | 2 | |||
3 | /* libmain - flex run-time support library "main" function */ | 3 | /* libmain - flex run-time support library "main" function */ | |
4 | 4 | |||
5 | /* This file is part of flex. */ | 5 | /* This file is part of flex. */ | |
6 | 6 | |||
7 | /* Redistribution and use in source and binary forms, with or without */ | 7 | /* Redistribution and use in source and binary forms, with or without */ | |
8 | /* modification, are permitted provided that the following conditions */ | 8 | /* modification, are permitted provided that the following conditions */ | |
9 | /* are met: */ | 9 | /* are met: */ | |
10 | 10 | |||
11 | /* 1. Redistributions of source code must retain the above copyright */ | 11 | /* 1. Redistributions of source code must retain the above copyright */ | |
12 | /* notice, this list of conditions and the following disclaimer. */ | 12 | /* notice, this list of conditions and the following disclaimer. */ | |
13 | /* 2. Redistributions in binary form must reproduce the above copyright */ | 13 | /* 2. Redistributions in binary form must reproduce the above copyright */ | |
14 | /* notice, this list of conditions and the following disclaimer in the */ | 14 | /* notice, this list of conditions and the following disclaimer in the */ | |
15 | /* documentation and/or other materials provided with the distribution. */ | 15 | /* documentation and/or other materials provided with the distribution. */ | |
16 | 16 | |||
17 | /* Neither the name of the University nor the names of its contributors */ | 17 | /* Neither the name of the University nor the names of its contributors */ | |
18 | /* may be used to endorse or promote products derived from this software */ | 18 | /* may be used to endorse or promote products derived from this software */ | |
19 | /* without specific prior written permission. */ | 19 | /* without specific prior written permission. */ | |
20 | 20 | |||
21 | /* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR */ | 21 | /* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR */ | |
22 | /* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */ | 22 | /* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */ | |
23 | /* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ | 23 | /* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ | |
24 | /* PURPOSE. */ | 24 | /* PURPOSE. */ | |
25 | #ifndef HAVE_NBTOOL_CONFIG_H | |||
25 | #include <sys/cdefs.h> | 26 | #include <sys/cdefs.h> | |
26 | #ifdef __RCSID | 27 | #ifdef __RCSID | |
27 | __RCSID("$NetBSD: libmain.c,v 1.3 2017/01/02 17:45:27 christos Exp $"); | 28 | __RCSID("$NetBSD: libmain.c,v 1.4 2018/03/11 18:32:10 christos Exp $"); | |
29 | #endif | |||
28 | #endif | 30 | #endif | |
29 | 31 | |||
30 | #include <stdlib.h> | 32 | #include <stdlib.h> | |
31 | 33 | |||
32 | extern int yylex (void); | 34 | extern int yylex (void); | |
33 | 35 | |||
34 | int main (int argc, char *argv[]) | 36 | int main (int argc, char *argv[]) | |
35 | { | 37 | { | |
36 | (void)argc; | 38 | (void)argc; | |
37 | (void)argv; | 39 | (void)argv; | |
38 | 40 | |||
39 | while (yylex () != 0) ; | 41 | while (yylex () != 0) ; | |
40 | 42 |
--- src/external/bsd/flex/dist/src/libyywrap.c 2016/01/09 17:38:57 1.2
+++ src/external/bsd/flex/dist/src/libyywrap.c 2018/03/11 18:32:10 1.3
@@ -1,35 +1,37 @@ | @@ -1,35 +1,37 @@ | |||
1 | /* $NetBSD: libyywrap.c,v 1.2 2016/01/09 17:38:57 christos Exp $ */ | 1 | /* $NetBSD: libyywrap.c,v 1.3 2018/03/11 18:32:10 christos Exp $ */ | |
2 | 2 | |||
3 | /* libyywrap - flex run-time support library "yywrap" function */ | 3 | /* libyywrap - flex run-time support library "yywrap" function */ | |
4 | 4 | |||
5 | /* This file is part of flex. */ | 5 | /* This file is part of flex. */ | |
6 | 6 | |||
7 | /* Redistribution and use in source and binary forms, with or without */ | 7 | /* Redistribution and use in source and binary forms, with or without */ | |
8 | /* modification, are permitted provided that the following conditions */ | 8 | /* modification, are permitted provided that the following conditions */ | |
9 | /* are met: */ | 9 | /* are met: */ | |
10 | 10 | |||
11 | /* 1. Redistributions of source code must retain the above copyright */ | 11 | /* 1. Redistributions of source code must retain the above copyright */ | |
12 | /* notice, this list of conditions and the following disclaimer. */ | 12 | /* notice, this list of conditions and the following disclaimer. */ | |
13 | /* 2. Redistributions in binary form must reproduce the above copyright */ | 13 | /* 2. Redistributions in binary form must reproduce the above copyright */ | |
14 | /* notice, this list of conditions and the following disclaimer in the */ | 14 | /* notice, this list of conditions and the following disclaimer in the */ | |
15 | /* documentation and/or other materials provided with the distribution. */ | 15 | /* documentation and/or other materials provided with the distribution. */ | |
16 | 16 | |||
17 | /* Neither the name of the University nor the names of its contributors */ | 17 | /* Neither the name of the University nor the names of its contributors */ | |
18 | /* may be used to endorse or promote products derived from this software */ | 18 | /* may be used to endorse or promote products derived from this software */ | |
19 | /* without specific prior written permission. */ | 19 | /* without specific prior written permission. */ | |
20 | 20 | |||
21 | /* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR */ | 21 | /* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR */ | |
22 | /* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */ | 22 | /* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */ | |
23 | /* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ | 23 | /* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ | |
24 | /* PURPOSE. */ | 24 | /* PURPOSE. */ | |
25 | #ifndef HAVE_NBTOOL_CONFIG_H | |||
25 | #include <sys/cdefs.h> | 26 | #include <sys/cdefs.h> | |
26 | #ifdef __RCSID | 27 | #ifdef __RCSID | |
27 | __RCSID("$NetBSD: libyywrap.c,v 1.2 2016/01/09 17:38:57 christos Exp $"); | 28 | __RCSID("$NetBSD: libyywrap.c,v 1.3 2018/03/11 18:32:10 christos Exp $"); | |
29 | #endif | |||
28 | #endif | 30 | #endif | |
29 | 31 | |||
30 | int yywrap (void); | 32 | int yywrap (void); | |
31 | 33 | |||
32 | int yywrap (void) | 34 | int yywrap (void) | |
33 | { | 35 | { | |
34 | return 1; | 36 | return 1; | |
35 | } | 37 | } |