diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-08-20 20:54:39 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-08-20 20:54:39 +0200 |
| commit | 29af7775cfef6ed3b466b92e44387574122ed61b (patch) | |
| tree | c968738daba6d87d69dc4e8b4cb1445a7b6420cb /hurd/hurdinit.c | |
| parent | 4893e0ed57daaff901442bacc10ae09cd3e1850f (diff) | |
| parent | f76453c31593957fec1a99b986bfa5506618b79c (diff) | |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Diffstat (limited to 'hurd/hurdinit.c')
| -rw-r--r-- | hurd/hurdinit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hurd/hurdinit.c b/hurd/hurdinit.c index 4c6a458d4d..184c975a31 100644 --- a/hurd/hurdinit.c +++ b/hurd/hurdinit.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992-2014 Free Software Foundation, Inc. +/* Copyright (C) 1992-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -38,7 +38,7 @@ int __libc_argc; error_t _hurd_ports_use (int which, error_t (*operate) (mach_port_t)) { - if (__builtin_expect (_hurd_ports == NULL, 0)) + if (__glibc_unlikely (_hurd_ports == NULL)) /* This means that _hurd_init has not been called yet, which is normally only the case in the bootstrap filesystem, and there only in the early phases of booting. */ |