]> The Tcpdump Group git mirrors - libpcap/commitdiff
Don't do the selectable FD or required select timeout stuff on MS-DOS.
authorGuy Harris <[email protected]>
Tue, 23 Jan 2018 17:36:37 +0000 (09:36 -0800)
committerGuy Harris <[email protected]>
Tue, 23 Jan 2018 17:36:37 +0000 (09:36 -0800)
pcap-int.h
pcap.c

index 7383ee03776a0a2b587e59f235648b6e75fa48cf..7877b6076511d7534a47b246cda9bcef0bfd4293 100644 (file)
@@ -220,7 +220,7 @@ struct pcap {
         */
        int bpf_codegen_flags;
 
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(MSDOS)
        int selectable_fd;      /* FD on which select()/poll()/epoll_wait()/kevent()/etc. can be done */
 
        /*
diff --git a/pcap.c b/pcap.c
index 80045949d13c3ed00d3a821dda5288e75515d125..d99a8ff520f3d656cf0a26ce347ef3ef5b8113fb 100644 (file)
--- a/pcap.c
+++ b/pcap.c
@@ -2099,11 +2099,13 @@ pcap_alloc_pcap_t(char *ebuf, size_t size)
 
 #ifdef _WIN32
        p->handle = INVALID_HANDLE_VALUE;       /* not opened yet */
-#else
+#else /* _WIN32 */
        p->fd = -1;     /* not opened yet */
+#ifndef MSDOS
        p->selectable_fd = -1;
        p->required_select_timeout = NULL;
-#endif
+#endif /* MSDOS */
+#endif /* _WIN32 */
 
        if (size == 0) {
                /* No private data was requested. */