Skip to content

Commit

Permalink
Always include <config.h> rather than "config.h".
Browse files Browse the repository at this point in the history 
This can prevent bizarre failures if, for example, you've done a
configuration in the top-level source directory, leaving behind one
config.h file, and then do an out-of-tree build in another directory,
with different configuration options.  This way, we always pick up the
same config.h, in the build directory.
  • Loading branch information
@guyharris
guyharris committed Aug 19, 2017
1 parent 170b965 commit 69fcdc6
Show file tree
Hide file tree
Showing 50 changed files with 50 additions and 50 deletions.
2 changes: 1 addition & 1 deletion bpf/net/bpf_filter.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#ifdef _WIN32
Expand Down
2 changes: 1 addition & 1 deletion bpf_dump.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include <pcap.h>
Expand Down
2 changes: 1 addition & 1 deletion bpf_image.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#ifdef _WIN32
Expand Down
2 changes: 1 addition & 1 deletion dlpisubs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#ifndef DL_IPATM
Expand Down
2 changes: 1 addition & 1 deletion etherent.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#ifdef _WIN32
Expand Down
2 changes: 1 addition & 1 deletion fad-getad.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include <sys/types.h>
Expand Down
2 changes: 1 addition & 1 deletion fad-gifc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include <sys/param.h>
Expand Down
2 changes: 1 addition & 1 deletion fad-glifc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include <sys/param.h>
Expand Down
2 changes: 1 addition & 1 deletion gencode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#ifdef _WIN32
Expand Down
2 changes: 1 addition & 1 deletion grammar.y
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#ifdef _WIN32
Expand Down
2 changes: 1 addition & 1 deletion inet.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#ifdef _WIN32
Expand Down
2 changes: 1 addition & 1 deletion missing/strtok_r.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include "portability.h"
Expand Down
2 changes: 1 addition & 1 deletion nametoaddr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#ifdef DECNETLIB
Expand Down
2 changes: 1 addition & 1 deletion optimize.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#ifdef _WIN32
Expand Down
2 changes: 1 addition & 1 deletion pcap-bpf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include <sys/param.h> /* optionally get BSD define */
Expand Down
2 changes: 1 addition & 1 deletion pcap-bt-linux.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include "pcap-int.h"
Expand Down
2 changes: 1 addition & 1 deletion pcap-bt-monitor-linux.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include <errno.h>
Expand Down
2 changes: 1 addition & 1 deletion pcap-common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#ifdef _WIN32
Expand Down
2 changes: 1 addition & 1 deletion pcap-dag.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include <sys/param.h> /* optionally get BSD define */
Expand Down
2 changes: 1 addition & 1 deletion pcap-dbus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include <string.h>
Expand Down
2 changes: 1 addition & 1 deletion pcap-dlpi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include <sys/types.h>
Expand Down
2 changes: 1 addition & 1 deletion pcap-enet.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include <sys/types.h>
Expand Down
2 changes: 1 addition & 1 deletion pcap-libdlpi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include <sys/types.h>
Expand Down
2 changes: 1 addition & 1 deletion pcap-linux.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
#define _GNU_SOURCE

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include <errno.h>
Expand Down
2 changes: 1 addition & 1 deletion pcap-netfilter-linux.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include "pcap-int.h"
Expand Down
2 changes: 1 addition & 1 deletion pcap-netmap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include <poll.h>
Expand Down
2 changes: 1 addition & 1 deletion pcap-new.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include "pcap-int.h" // for the details of the pcap_t structure
Expand Down
2 changes: 1 addition & 1 deletion pcap-nit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include <sys/types.h>
Expand Down
2 changes: 1 addition & 1 deletion pcap-null.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include <sys/param.h> /* optionally get BSD define */
Expand Down
2 changes: 1 addition & 1 deletion pcap-pf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include <sys/types.h>
Expand Down
2 changes: 1 addition & 1 deletion pcap-rpcap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include <string.h> /* for strlen(), ... */
Expand Down
2 changes: 1 addition & 1 deletion pcap-septel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include <sys/param.h>
Expand Down
2 changes: 1 addition & 1 deletion pcap-sita.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include <stdio.h>
Expand Down
2 changes: 1 addition & 1 deletion pcap-snf.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#ifdef _WIN32
Expand Down
2 changes: 1 addition & 1 deletion pcap-snit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include <sys/types.h>
Expand Down
2 changes: 1 addition & 1 deletion pcap-snoop.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include <sys/param.h>
Expand Down
2 changes: 1 addition & 1 deletion pcap-tc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include <pcap.h>
Expand Down
2 changes: 1 addition & 1 deletion pcap-usb-linux.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include "pcap-int.h"
Expand Down
2 changes: 1 addition & 1 deletion pcap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#ifdef _WIN32
Expand Down
2 changes: 1 addition & 1 deletion rpcapd/daemon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include "ftmacros.h"
Expand Down
2 changes: 1 addition & 1 deletion rpcapd/fileconf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#include "ftmacros.h"
Expand Down
2 changes: 1 addition & 1 deletion rpcapd/rpcapd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#ifdef _WIN32
Expand Down
2 changes: 1 addition & 1 deletion savefile.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
*/

#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif

#ifdef _WIN32
Expand Down
2 changes: 1 addition & 1 deletion scanner.l
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%top {
/* Must come first for _LARGE_FILE_API on AIX. */
#ifdef HAVE_CONFIG_H
#include "config.h"
#include <config.h>
#endif
}

Expand Down
Loading

0 comments on commit 69fcdc6

Please sign in to comment.