diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2013-02-14 14:18:48 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2013-02-14 14:18:48 -0800 |
| commit | b070104dcb72b99825d645e9e41a5362bd4ff735 (patch) | |
| tree | b4b388d6c46424b98f106a4b76f19eb0a102fad8 /userspace/ebtables2/include | |
| parent | cc02d5675e448c68ac14960a9d225dde8bd695e5 (diff) | |
| parent | 6da47f391cf8bde3cf0575123fe38224cfb58928 (diff) | |
| download | android_external_ebtables-cm-13.0.tar.gz android_external_ebtables-cm-13.0.tar.bz2 android_external_ebtables-cm-13.0.zip | |
Merge "ebtables: Android makefiles to build ebtables on Android"HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001staging/cm-12.1staging/cm-12.0-cafstable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0Estable/cm-12.1-YOG7Dstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3Cstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1Icm-13.0cm-12.1cm-12.0
Diffstat (limited to 'userspace/ebtables2/include')
| -rw-r--r-- | userspace/ebtables2/include/ebtables_u.h | 7 | ||||
| -rw-r--r-- | userspace/ebtables2/include/ethernetdb.h | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/userspace/ebtables2/include/ebtables_u.h b/userspace/ebtables2/include/ebtables_u.h index ab615c1..07dae8e 100644 --- a/userspace/ebtables2/include/ebtables_u.h +++ b/userspace/ebtables2/include/ebtables_u.h @@ -24,7 +24,14 @@ #ifndef EBTABLES_U_H #define EBTABLES_U_H #include <netinet/in.h> + +#ifdef __ANDROID_API__ +#pragma message "Found __ANDRIOD_API__, #undef __unused" +#undef __unused +#include <ebtables.h> +#else #include <linux/netfilter_bridge/ebtables.h> +#endif #include <linux/netfilter/x_tables.h> #ifndef IPPROTO_SCTP diff --git a/userspace/ebtables2/include/ethernetdb.h b/userspace/ebtables2/include/ethernetdb.h index 46d8bfd..22b6f7f 100644 --- a/userspace/ebtables2/include/ethernetdb.h +++ b/userspace/ebtables2/include/ethernetdb.h @@ -30,6 +30,8 @@ #define _PATH_ETHERTYPES "/etc/ethertypes" #endif /* _PATH_ETHERTYPES */ +#define __THROW + struct ethertypeent { char *e_name; /* Official ethernet type name. */ char **e_aliases; /* Alias list. */ |