Remove some unneeded includes of <sys/time.h>.
authorGuy Harris <guy@alum.mit.edu>
Sat, 28 Feb 2015 03:51:37 +0000 (19:51 -0800)
committerGuy Harris <guy@alum.mit.edu>
Sat, 28 Feb 2015 04:59:08 +0000 (04:59 +0000)
Change-Id: I9e4e6efa9f8c7dbff7627f8d5fc3278ab383618d
Reviewed-on: https://code.wireshark.org/review/7441
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
asn1/pkcs12/packet-pkcs12-template.c
capinfos.c
echld_test.c
editcap.c
epan/dissectors/packet-pkcs12.c
mergecap.c
wiretap/ascend-int.h
wiretap/merge.c
wiretap/wtap-int.h
wiretap/wtap.h

index 63d09b0..797dffc 100644 (file)
 
 #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>
index 31a6fb3..ae3e04f 100644 (file)
 #include <getopt.h>
 #endif
 
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
 #include <glib.h>
 
 #ifdef HAVE_LIBZ
index fff59df..0c6cc7a 100644 (file)
@@ -32,7 +32,6 @@
 # include <sys/types.h>
 #endif
 
-#include <sys/time.h>
 #include <sys/uio.h>
 
 #ifdef HAVE_UNISTD_H
index 5fc8307..9f08f0b 100644 (file)
--- a/editcap.c
+++ b/editcap.c
 #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
index 1bded35..f9422ab 100644 (file)
 
 #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");
 
index 5446fc6..e6c1dd5 100644 (file)
 #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
index 812693d..c88b665 100644 (file)
 #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"
 
index 4bd2394..cc0590b 100644 (file)
 #include <unistd.h>
 #endif
 
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
 #include <string.h>
 #include "merge.h"
 
index 6f63cfe..c98e457 100644 (file)
 #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>
index f5aaebf..1185d6a 100644 (file)
 #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>