From c1c2259b131dfe67893149274d312a7eec28dd32 Mon Sep 17 00:00:00 2001 From: Calvin Buckley Date: Sun, 26 Jan 2025 16:13:23 -0400 Subject: [PATCH] Move vmnet below the definition of MAX to avoid redefinition --- sim_ether.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sim_ether.c b/sim_ether.c index 5ff5db5a..3832c696 100644 --- a/sim_ether.c +++ b/sim_ether.c @@ -379,13 +379,13 @@ #include #endif +#define MAX(a,b) (((a) > (b)) ? (a) : (b)) + // Declare earlier than other implementations #ifdef HAVE_VMNET_NETWORK #include #endif -#define MAX(a,b) (((a) > (b)) ? (a) : (b)) - /* Internal routine - forward declaration */ static int _eth_get_system_id (char *buf, size_t buf_size); static void eth_get_nic_hw_addr(ETH_DEV* dev, const char *devname, int set_on);