diff options
| -rw-r--r-- | asn1/pkcs12/packet-pkcs12-template.c | 4 | ||||
| -rw-r--r-- | capinfos.c | 4 | ||||
| -rw-r--r-- | echld_test.c | 1 | ||||
| -rw-r--r-- | editcap.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-pkcs12.c | 16 | ||||
| -rw-r--r-- | mergecap.c | 4 | ||||
| -rw-r--r-- | wiretap/ascend-int.h | 4 | ||||
| -rw-r--r-- | wiretap/merge.c | 4 | ||||
| -rw-r--r-- | wiretap/wtap-int.h | 4 | ||||
| -rw-r--r-- | wiretap/wtap.h | 4 |
10 files changed, 6 insertions, 43 deletions
diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c index 63d09b04fa..797dffce8b 100644 --- a/asn1/pkcs12/packet-pkcs12-template.c +++ b/asn1/pkcs12/packet-pkcs12-template.c @@ -27,10 +27,6 @@ #include "config.h" -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif - #include <epan/packet.h> #include <epan/expert.h> #include <epan/oids.h> diff --git a/capinfos.c b/capinfos.c index 31a6fb32ff..ae3e04f2b1 100644 --- a/capinfos.c +++ b/capinfos.c @@ -71,10 +71,6 @@ #include <getopt.h> #endif -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif - #include <glib.h> #ifdef HAVE_LIBZ diff --git a/echld_test.c b/echld_test.c index fff59dfc89..0c6cc7a033 100644 --- a/echld_test.c +++ b/echld_test.c @@ -32,7 +32,6 @@ # include <sys/types.h> #endif -#include <sys/time.h> #include <sys/uio.h> #ifdef HAVE_UNISTD_H @@ -54,10 +54,6 @@ #include <getopt.h> #endif -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif - #ifdef HAVE_LIBZ #include <zlib.h> /* to get the libz version number */ #endif diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c index 1bded351d6..f9422abfaf 100644 --- a/epan/dissectors/packet-pkcs12.c +++ b/epan/dissectors/packet-pkcs12.c @@ -35,10 +35,6 @@ #include "config.h" -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif - #include <epan/packet.h> #include <epan/expert.h> #include <epan/oids.h> @@ -144,7 +140,7 @@ static int hf_pkcs12_encryptionScheme = -1; /* AlgorithmIdentifier */ static int hf_pkcs12_messageAuthScheme = -1; /* AlgorithmIdentifier */ /*--- End of included file: packet-pkcs12-hf.c ---*/ -#line 81 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 77 "../../asn1/pkcs12/packet-pkcs12-template.c" /* Initialize the subtree pointers */ @@ -172,7 +168,7 @@ static gint ett_pkcs12_PBES2Params = -1; static gint ett_pkcs12_PBMAC1Params = -1; /*--- End of included file: packet-pkcs12-ett.c ---*/ -#line 84 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 80 "../../asn1/pkcs12/packet-pkcs12-template.c" static void append_oid(proto_tree *tree, const char *oid) { @@ -1163,7 +1159,7 @@ static int dissect_PBMAC1Params_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p /*--- End of included file: packet-pkcs12-fn.c ---*/ -#line 392 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 388 "../../asn1/pkcs12/packet-pkcs12-template.c" static int strip_octet_string(tvbuff_t *tvb) { @@ -1451,7 +1447,7 @@ void proto_register_pkcs12(void) { "AlgorithmIdentifier", HFILL }}, /*--- End of included file: packet-pkcs12-hfarr.c ---*/ -#line 459 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 455 "../../asn1/pkcs12/packet-pkcs12-template.c" }; /* List of subtrees */ @@ -1482,7 +1478,7 @@ void proto_register_pkcs12(void) { &ett_pkcs12_PBMAC1Params, /*--- End of included file: packet-pkcs12-ettarr.c ---*/ -#line 465 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 461 "../../asn1/pkcs12/packet-pkcs12-template.c" }; static ei_register_info ei[] = { { &ei_pkcs12_octet_string_expected, { "pkcs12.octet_string_expected", PI_PROTOCOL, PI_WARN, "BER Error: OCTET STRING expected", EXPFILL }}, @@ -1550,7 +1546,7 @@ void proto_reg_handoff_pkcs12(void) { /*--- End of included file: packet-pkcs12-dis-tab.c ---*/ -#line 504 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 500 "../../asn1/pkcs12/packet-pkcs12-template.c" register_ber_oid_dissector("1.2.840.113549.1.9.22.1", dissect_X509Certificate_OCTETSTRING_PDU, proto_pkcs12, "x509Certificate"); diff --git a/mergecap.c b/mergecap.c index 5446fc6584..e6c1dd5a9b 100644 --- a/mergecap.c +++ b/mergecap.c @@ -38,10 +38,6 @@ #include <getopt.h> #endif -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif - #ifdef HAVE_LIBZ #include <zlib.h> /* to get the libz version number */ #endif diff --git a/wiretap/ascend-int.h b/wiretap/ascend-int.h index 812693df4e..c88b665edd 100644 --- a/wiretap/ascend-int.h +++ b/wiretap/ascend-int.h @@ -24,10 +24,6 @@ #ifndef __ASCEND_INT_H__ #define __ASCEND_INT_H__ -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif - #include <glib.h> #include "ws_symbol_export.h" diff --git a/wiretap/merge.c b/wiretap/merge.c index 4bd2394c35..cc0590b2e7 100644 --- a/wiretap/merge.c +++ b/wiretap/merge.c @@ -33,10 +33,6 @@ #include <unistd.h> #endif -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif - #include <string.h> #include "merge.h" diff --git a/wiretap/wtap-int.h b/wiretap/wtap-int.h index 6f63cfe939..c98e4572a0 100644 --- a/wiretap/wtap-int.h +++ b/wiretap/wtap-int.h @@ -21,10 +21,6 @@ #ifndef __WTAP_INT_H__ #define __WTAP_INT_H__ -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif - #include <glib.h> #include <stdio.h> #include <time.h> diff --git a/wiretap/wtap.h b/wiretap/wtap.h index f5aaebfa61..1185d6ac28 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -21,10 +21,6 @@ #ifndef __WTAP_H__ #define __WTAP_H__ -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#endif - #include <glib.h> #include <time.h> #include <wsutil/buffer.h> |