The following commit has been merged in the master branch: commit cb1d16c7295b9dae7e2d00c280e13047359e954b Author: Marek Lindner lindner_marek@yahoo.de Date: Sat Jan 15 15:02:46 2011 +0100
batctl: adding __packed linux kernel compat macro
The linux kernel prefers the __packed macro instead of __attribute((packed)) for which batctl needs a compatibility macro as it shares packet definitions with the batman-adv kernel module.
Reported-by: Sven Eckelmann sven@narfation.org Signed-off-by: Marek Lindner lindner_marek@yahoo.de
diff --git a/main.h b/main.h index 8689d67..9297c15 100644 --- a/main.h +++ b/main.h @@ -24,3 +24,5 @@ #define SOURCE_VERSION "devel" /*put exactly one distinct word inside the string like "0.3-pre-alpha" or "0.3-rc1" or "0.3" */
#define SOCKET_PATH_FMT "%s/batman_adv/%s/socket" + +#define __packed __attribute((packed)) /* linux kernel compat */