diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/bits/types.h | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/sockunion.h | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/sysdep.h | 22 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/netatalk/at.h | 2 |
4 files changed, 17 insertions, 12 deletions
diff --git a/sysdeps/generic/bits/types.h b/sysdeps/generic/bits/types.h index 8bb6c78..e34ad72 100644 --- a/sysdeps/generic/bits/types.h +++ b/sysdeps/generic/bits/types.h @@ -109,6 +109,9 @@ typedef struct #endif } __fd_set; +/* XXX Used in `struct shmid_ds'. */ +typedef unsigned short int __ipc_pid_t; + /* Types from the Large File Support interface. */ diff --git a/sysdeps/unix/sysv/linux/bits/sockunion.h b/sysdeps/unix/sysv/linux/bits/sockunion.h index 1645e6e..c65cf84 100644 --- a/sysdeps/unix/sysv/linux/bits/sockunion.h +++ b/sysdeps/unix/sysv/linux/bits/sockunion.h @@ -24,6 +24,7 @@ #include <netash/ash.h> #include <netatalk/at.h> #include <netax25/ax25.h> +#include <neteconet/ec.h> #include <netinet/in.h> #include <netipx/ipx.h> #include <netrose/rose.h> @@ -37,6 +38,7 @@ union sockaddr_union struct sockaddr_ash sash; struct sockaddr_at sat; struct sockaddr_ax25 sax25; + struct sockaddr_ec sec; struct sockaddr_in sin; struct sockaddr_in6 sin6; struct sockaddr_ipx sipx; diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h index 910cf3f..a6971ff 100644 --- a/sysdeps/unix/sysv/linux/i386/sysdep.h +++ b/sysdeps/unix/sysv/linux/i386/sysdep.h @@ -202,14 +202,14 @@ /* We need some help from the assembler to generate optimal code. We define some macros here which later will be used. */ -asm ("__X'%ebx = 1\n\t" - "__X'%ecx = 2\n\t" - "__X'%edx = 2\n\t" - "__X'%eax = 3\n\t" - "__X'%esi = 3\n\t" - "__X'%edi = 3\n\t" - "__X'%ebp = 3\n\t" - "__X'%esp = 3\n\t" +asm (".L__X'%ebx = 1\n\t" + ".L__X'%ecx = 2\n\t" + ".L__X'%edx = 2\n\t" + ".L__X'%eax = 3\n\t" + ".L__X'%esi = 3\n\t" + ".L__X'%edi = 3\n\t" + ".L__X'%ebp = 3\n\t" + ".L__X'%esp = 3\n\t" ".macro bpushl name reg\n\t" ".if 1 - \\name\n\t" ".if 2 - \\name\n\t" @@ -243,11 +243,11 @@ asm ("__X'%ebx = 1\n\t" ({ \ unsigned int resultvar; \ asm volatile ( \ - "bpushl __X'%k2, %k2\n\t" \ - "bmovl __X'%k2, %k2\n\t" \ + "bpushl .L__X'%k2, %k2\n\t" \ + "bmovl .L__X'%k2, %k2\n\t" \ "movl %1, %%eax\n\t" \ "int $0x80\n\t" \ - "bpopl __X'%k2, %k2\n\t" \ + "bpopl .L__X'%k2, %k2\n\t" \ : "=a" (resultvar) \ : "i" (__NR_##name) ASMFMT_##nr(args) : "memory", "cc"); \ if (resultvar >= 0xfffff001) \ diff --git a/sysdeps/unix/sysv/linux/netatalk/at.h b/sysdeps/unix/sysv/linux/netatalk/at.h index 4c58610..83a94f3 100644 --- a/sysdeps/unix/sysv/linux/netatalk/at.h +++ b/sysdeps/unix/sysv/linux/netatalk/at.h @@ -20,8 +20,8 @@ #define _NETATALK_AT_H 1 #include <asm/types.h> -#include <sys/socket.h> #include <linux/atalk.h> +#include <sys/socket.h> #define SOL_ATALK 258 /* sockopt level for atalk */ |