← Back to branch summary

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

« back to all changes in this revision

Viewing changes to time/time.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:
time/time.h
367
367
/* Delete timer TIMERID.  */
368
368
extern int timer_delete (timer_t __timerid) __THROW;
369
369
 
370
 
/* Set timer TIMERID to VALUE, returning old value in OVLAUE.  */
 
370
/* Set timer TIMERID to VALUE, returning old value in OVALUE.  */
371
371
extern int timer_settime (timer_t __timerid, int __flags,
372
372
                          const struct itimerspec *__restrict __value,
373
373
                          struct itimerspec *__restrict __ovalue) __THROW;
374
374
 
375
 
/* Get current value of timer TIMERID and store it in VLAUE.  */
 
375
/* Get current value of timer TIMERID and store it in VALUE.  */
376
376
extern int timer_gettime (timer_t __timerid, struct itimerspec *__value)
377
377
     __THROW;
378
378