Rename pcap/export-defs.h to pcap/funcattrs.h.

We'll be moving all the function attribute stuff from funcattrs.h into
it, so that they can all be used in exported header files.

diff --git a/Makefile.in b/Makefile.in
index 388f16040ef86283c69ccdd0d17800e86327635e..535b7de919c604097b380572dd6841e57d7100ea 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -105,7 +105,7 @@ PUBHDR = \
        pcap/bluetooth.h \
        pcap/can_socketcan.h \
        pcap/dlt.h \
-       pcap/export-defs.h \
+       pcap/funcattrs.h \
        pcap/ipnet.h \
        pcap/namedb.h \
        pcap/nflog.h \

diff --git a/gen_version_c.sh b/gen_version_c.sh
index ae4ef9c5e898783f7fd94748578c7c0517f689a1..1f66c2568398e7e34898bc471748e9e2aedc46e5 100755 (executable)
--- a/gen_version_c.sh
+++ b/gen_version_c.sh
@@ -16,7 +16,7 @@ then
        exit 1
 fi
 version_string=`print_version_string "$1"`
-echo '#include <pcap/export-defs.h>' > "$2"
+echo '#include <pcap/funcattrs.h>' > "$2"
 echo 'PCAP_API_DEF' >> "$2"
 echo "$version_string" | sed -e 's/.*/char pcap_version[] = "&";/' >> "$2"
 

diff --git a/pcap/bpf.h b/pcap/bpf.h
index d767ad73e6a8660d3a25a1557147c22a5bbeed71..1a953a9b71d8947acf88db787fddcb1d914078b7 100644 (file)
--- a/pcap/bpf.h
+++ b/pcap/bpf.h
@@ -68,7 +68,7 @@
 #if !defined(_NET_BPF_H_) && !defined(_NET_BPF_H_INCLUDED) && !defined(_BPF_H_) && !defined(_H_BPF) && !defined(lib_pcap_bpf_h)
 #define lib_pcap_bpf_h
 
-#include <pcap/export-defs.h>
+#include <pcap/funcattrs.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/pcap/export-defs.h b/pcap/funcattrs.h
similarity index 100%
rename from pcap/export-defs.h
rename to pcap/funcattrs.h

diff --git a/pcap/pcap.h b/pcap/pcap.h
index 92a7270ee984cb4ddc4374a1135ab507c8e0b220..2a6e007d94aedf861bf38b9db8481227d6d0f085 100644 (file)
--- a/pcap/pcap.h
+++ b/pcap/pcap.h
@@ -69,7 +69,7 @@
 #ifndef lib_pcap_pcap_h
 #define lib_pcap_pcap_h
 
-#include <pcap/export-defs.h>
+#include <pcap/funcattrs.h>
 
 #if defined(_WIN32)
   #include <winsock2.h>                /* u_int, u_char etc. */