← Back to branch summary

~ubuntu-branches/ubuntu/trusty/eglibc/trusty

« back to all changes in this revision

Viewing changes to sysdeps/unix/sysv/linux/sparc/bits/typesizes.h

  • Committer: Package Import Robot
  • Author(s): Adam Conrad
  • Date: 2013-01-10 18:39:35 UTC
  • mfrom: (1.5.2) (4.4.24 experimental)
  • Revision ID: package-import@ubuntu.com-20130110183935-afsgfxkmg7wk5eaj
Tags: 2.17-0ubuntu1
https://launchpad.net/bugs/1085342
https://launchpad.net/bugs/613662
* Merge with Debian, bringing in a new upstream and many small fixes:
  - patches/any/cvs-malloc-deadlock.diff: Dropped, merged upstream.
  - patches/ubuntu/lddebug-scopes.diff: Rebase for upstream changes.
  - patches/ubuntu/local-CVE-2012-3406.diff: Rebased against upstream.
  - patches/ubuntu/no-asm-mtune-i686.diff: Fixed in recent binutils.
* This upstream merge fixes a nasty hang in pulseaudio (LP: #1085342)
* Bump MIN_KERNEL_SUPPORTED to 2.6.32 on ARM, now that we no longer
  have to support shonky 2.6.31 kernels on imx51 babbage builders.
* Drop patches/ubuntu/local-disable-nscd-host-caching.diff, as these
  issues were apparently resolved upstream a while ago (LP: #613662)
* Fix the compiled-in bug URL to point to launchpad.net, not Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sysdeps/unix/sysv/linux/sparc/bits/typesizes.h
51
51
#define __USECONDS_T_TYPE       __U32_TYPE
52
52
#define __SUSECONDS_T_TYPE      __S32_TYPE
53
53
#define __DADDR_T_TYPE          __S32_TYPE
54
 
#define __SWBLK_T_TYPE          __SLONGWORD_TYPE
55
54
#define __KEY_T_TYPE            __S32_TYPE
56
55
#define __CLOCKID_T_TYPE        __S32_TYPE
57
56
#define __TIMER_T_TYPE          void *
61
60
#define __SYSCALL_SLONG_TYPE    __SLONGWORD_TYPE
62
61
#define __SYSCALL_ULONG_TYPE    __ULONGWORD_TYPE
63
62
 
 
63
#if defined __arch64__ || defined __sparcv9
 
64
/* Tell the libc code that off_t and off64_t are actually the same type
 
65
   for all ABI purposes, even if possibly expressed as different base types
 
66
   for C type-checking purposes.  */
 
67
# define __OFF_T_MATCHES_OFF64_T        1
 
68
 
 
69
/* Same for ino_t and ino64_t.  */
 
70
# define __INO_T_MATCHES_INO64_T        1
 
71
#endif
 
72
 
64
73
/* Number of descriptors that can fit in an `fd_set'.  */
65
74
#define __FD_SETSIZE            1024
66
75