Skip to content

Commit f67e46a

Browse files
fxlbfxlb
committed
Include <config.h> unconditionally
Builds using Autotools or CMake generate config.h, thus remove the '#ifdef HAVE_CONFIG_H'/'#endif'. Remove also the 'add_definitions(-DHAVE_CONFIG_H)' in CMakeLists.txt. (backported from commit 94a3708)
1 parent c5c912a commit f67e46a

File tree

190 files changed

+0
-380
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+0
-380
lines changed

‎CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,6 @@ file(STRINGS ${tcpdump_SOURCE_DIR}/VERSION
279279
# Project settings
280280
######################################
281281

282-
add_definitions(-DHAVE_CONFIG_H)
283-
284282
include_directories(
285283
${CMAKE_CURRENT_BINARY_DIR}
286284
${tcpdump_SOURCE_DIR}

‎addrtoname.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
* and address to string conversion routines
2323
*/
2424

25-
#ifdef HAVE_CONFIG_H
2625
#include <config.h>
27-
#endif
2826

2927
#ifdef HAVE_CASPER
3028
#include <libcasper.h>

‎addrtostr.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@
3636
* SUCH DAMAGE.
3737
*/
3838

39-
#ifdef HAVE_CONFIG_H
4039
#include <config.h>
41-
#endif
4240

4341
#include "netdissect-stdinc.h"
4442
#include "addrtostr.h"

‎af.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
* Original code by Hannes Gredler ([email protected])
1616
*/
1717

18-
#ifdef HAVE_CONFIG_H
1918
#include <config.h>
20-
#endif
2119

2220
#include "netdissect-stdinc.h"
2321
#include "netdissect.h"

‎bpf_dump.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
2020
*/
2121

22-
#ifdef HAVE_CONFIG_H
2322
#include <config.h>
24-
#endif
2523

2624
#include "netdissect-stdinc.h"
2725

‎checksum.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
* Original code by Hannes Gredler ([email protected])
1818
*/
1919

20-
#ifdef HAVE_CONFIG_H
2120
#include <config.h>
22-
#endif
2321

2422
#include "netdissect-stdinc.h"
2523

‎cpack.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
2727
* OF SUCH DAMAGE.
2828
*/
2929

30-
#ifdef HAVE_CONFIG_H
3130
#include <config.h>
32-
#endif
3331

3432
#include <stdlib.h>
3533
#include <string.h>

‎gmpls.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@
1313
* Original code by Hannes Gredler ([email protected])
1414
*/
1515

16-
#ifdef HAVE_CONFIG_H
1716
#include <config.h>
18-
#endif
1917

2018
#include "netdissect-stdinc.h"
2119

‎in_cksum.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@
3535
* @(#)in_cksum.c 8.1 (Berkeley) 6/10/93
3636
*/
3737

38-
#ifdef HAVE_CONFIG_H
3938
# include <config.h>
40-
#endif
4139

4240
#include "netdissect-stdinc.h"
4341

‎ipproto.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@
1313
* Original code by Hannes Gredler ([email protected])
1414
*/
1515

16-
#ifdef HAVE_CONFIG_H
1716
#include <config.h>
18-
#endif
1917

2018
#include "netdissect-stdinc.h"
2119

0 commit comments

Comments
 (0)