mirror of
https://git.proxmox.com/git/mirror_iproute2
synced 2025-10-05 07:15:06 +00:00
596b1c94aa
iproute2 contains a bunch of kernel headers, including uapi ones. Android's libc uses uapi headers almost directly, and uses a script to fix kernel types that don't match what userspace expects. For example: https://issuetracker.google.com/36987220 reports that our struct ip_mreq_source contains "__be32 imr_multiaddr" rather than "struct in_addr imr_multiaddr". The script addresses this by replacing the uapi struct definition with a #include <bits/ip_mreq.h> which contains the traditional userspace definition. Unfortunately, when we compile iproute2, this definition conflicts with the one in iproute2's linux/in.h. Historically we've just solved this problem by running "git rm" on all the iproute2 include/linux headers that break Android's libc. However, deleting the files in this way makes it harder to keep up with upstream, because every upstream change to an include file causes a merge conflict with the delete. This patch fixes the problem by moving the iproute2 linux headers from include/linux to include/uapi/linux. Tested: compiles on ubuntu trusty (glibc) Signed-off-by: Elliott Hughes <enh@google.com> Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
30 lines
889 B
C
30 lines
889 B
C
/* atmapi.h - ATM API user space/kernel compatibility */
|
|
|
|
/* Written 1999,2000 by Werner Almesberger, EPFL ICA */
|
|
|
|
|
|
#ifndef _LINUX_ATMAPI_H
|
|
#define _LINUX_ATMAPI_H
|
|
|
|
#if defined(__sparc__) || defined(__ia64__)
|
|
/* such alignment is not required on 32 bit sparcs, but we can't
|
|
figure that we are on a sparc64 while compiling user-space programs. */
|
|
#define __ATM_API_ALIGN __attribute__((aligned(8)))
|
|
#else
|
|
#define __ATM_API_ALIGN
|
|
#endif
|
|
|
|
|
|
/*
|
|
* Opaque type for kernel pointers. Note that _ is never accessed. We need
|
|
* the struct in order hide the array, so that we can make simple assignments
|
|
* instead of being forced to use memcpy. It also improves error reporting for
|
|
* code that still assumes that we're passing unsigned longs.
|
|
*
|
|
* Convention: NULL pointers are passed as a field of all zeroes.
|
|
*/
|
|
|
|
typedef struct { unsigned char _[8]; } __ATM_API_ALIGN atm_kptr_t;
|
|
|
|
#endif
|