From: Joseph C. Lehner Date: Fri, 5 Feb 2016 10:39:44 +0000 (+0200) Subject: Don't redefine PACKED X-Git-Tag: v0.9~47 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f3cd34f1b9aef2bd3adce387ad4db15870c7cb62;p=oweals%2Fnmrpflash.git Don't redefine PACKED --- diff --git a/nmrp.c b/nmrp.c index 288bbb7..1f31e01 100644 --- a/nmrp.c +++ b/nmrp.c @@ -36,9 +36,12 @@ #define ETH_P_NMRP 0x0912 #define IP_LEN 4 -#define PACKED __attribute__((__packed__)) #define MAX_LOOP_RECV 1024 +#ifndef PACKED +#define PACKED __attribute__((__packed__)) +#endif + enum nmrp_code { NMRP_C_NONE = 0, NMRP_C_ADVERTISE = 1,