summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/netdev/pcap.cpp
diff options
context:
space:
mode:
author Jean-François DEL NERO <jeanfrancoisdelnero@free.fr>2015-12-28 11:27:47 +0100
committer Jean-François DEL NERO <jeanfrancoisdelnero@free.fr>2015-12-28 11:27:47 +0100
commit2a5e044fc23624a388bdb5f82ef9c11cbed6a9c7 (patch)
treeb468f54cdcbb7252d14790a7a013b138b1bd9b03 /src/osd/modules/netdev/pcap.cpp
parent077fe7ad89d65bbeafde141c9b3f71ca8df42f1c (diff)
parent11fcbaa28583023ea93a8f0c1f3fb9082d3295ab (diff)
Merge https://github.com/mamedev/mame
# Conflicts: # src/devices/video/ef9365.cpp
Diffstat (limited to 'src/osd/modules/netdev/pcap.cpp')
-rw-r--r--src/osd/modules/netdev/pcap.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/osd/modules/netdev/pcap.cpp b/src/osd/modules/netdev/pcap.cpp
index 833548cfabb..1e4f7dbea5e 100644
--- a/src/osd/modules/netdev/pcap.cpp
+++ b/src/osd/modules/netdev/pcap.cpp
@@ -60,10 +60,10 @@ public:
}
virtual ~pcap_module() { }
- virtual int init(const osd_options &options);
- virtual void exit();
+ virtual int init(const osd_options &options) override;
+ virtual void exit() override;
- virtual bool probe();
+ virtual bool probe() override;
HMODULE handle;
};
@@ -109,10 +109,10 @@ public:
netdev_pcap(const char *name, class device_network_interface *ifdev, int rate);
~netdev_pcap();
- int send(UINT8 *buf, int len);
- void set_mac(const char *mac);
+ virtual int send(UINT8 *buf, int len) override;
+ virtual void set_mac(const char *mac) override;
protected:
- int recv_dev(UINT8 **buf);
+ virtual int recv_dev(UINT8 **buf) override;
private:
pcap_t *m_p;
#ifdef SDLMAME_MACOSX