summaryrefslogtreecommitdiff
path: root/libc/intl/gettextP.h
diff options
context:
space:
mode:
authorjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2011-10-25 00:37:10 +0000
committerjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2011-10-25 00:37:10 +0000
commit4bbe4e2185c5484328182720ff7b3bb4f9593bff (patch)
treecd67e40a74928c0f58d4f5b79d2e260e4099fee7 /libc/intl/gettextP.h
parent91b4be71461f78cabe1fb5f164cea71b60e9e98a (diff)
downloadeglibc2-4bbe4e2185c5484328182720ff7b3bb4f9593bff.tar.gz
Merge changes between r15223 and r15532 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@15545 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/intl/gettextP.h')
-rw-r--r--libc/intl/gettextP.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/libc/intl/gettextP.h b/libc/intl/gettextP.h
index f1aa329e4..381e0f18e 100644
--- a/libc/intl/gettextP.h
+++ b/libc/intl/gettextP.h
@@ -1,5 +1,5 @@
/* Header describing internals of libintl library.
- Copyright (C) 1995-1999, 2000, 2001, 2004-2005, 2007
+ Copyright (C) 1995-1999, 2000, 2001, 2004-2005, 2007, 2011
Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
@@ -54,12 +54,6 @@
# define attribute_hidden
#endif
-/* Tell the compiler when a conditional or integer expression is
- almost always true or almost always false. */
-#ifndef HAVE_BUILTIN_EXPECT
-# define __builtin_expect(expr, val) (expr)
-#endif
-
#ifndef W
# define W(flag, data) ((flag) ? SWAP (data) : (data))
#endif