← Back to branch summary

~ubuntu-branches/ubuntu/saucy/gnutls26/saucy-security

« back to all changes in this revision

Viewing changes to lib/gl/stdio-impl.h

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2013-03-07 12:47:58 UTC
  • mfrom: (12.4.33 experimental)
  • Revision ID: package-import@ubuntu.com-20130307124758-wlp31d99bw5hi0tv
Tags: 2.12.23-1ubuntu1
* Merge from debian-experimental, remaining changes:
  - Build gnutls-bin from this source package rather than from gnutls28:
    gnutls28's licensing is currently too strict for many of the free
    software packages built against it in Ubuntu main and we only want to
    support a single version.  Bump its version to achieve this.
* Drop gnulib-gets.diff: upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/gl/stdio-impl.h
28
28
 
29
29
#include <errno.h>                             /* For detecting Plan9.  */
30
30
 
31
 
#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
 
31
#if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
32
32
 
33
33
# if defined __DragonFly__          /* DragonFly */
34
34
  /* See <http://www.dragonflybsd.org/cvsweb/src/lib/libc/stdio/priv_stdio.h?rev=HEAD&content-type=text/x-cvsweb-markup>.  */
66
66
      /* More fields, not relevant here.  */
67
67
    };
68
68
#  define fp_ub ((struct __sfileext *) fp->_ext._base)->_ub
69
 
# else                                         /* FreeBSD, NetBSD <= 1.5Z, DragonFly, MacOS X, Cygwin */
 
69
# else                                         /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin */
70
70
#  define fp_ub fp_->_ub
71
71
# endif
72
72