aboutsummaryrefslogtreecommitdiff
path: root/intl/loadinfo.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-09-10 14:34:15 -0400
committerUlrich Drepper <drepper@gmail.com>2011-09-10 14:34:15 -0400
commit3ce1f2959437e952b9db4eaeed2407424f11a4d1 (patch)
treedb47da854c7d3bfc2c3bce4c6fc8381075ac9ec4 /intl/loadinfo.h
parent1248c1c41508387ff282b208636737e8cdc9b5b0 (diff)
downloadglibc-3ce1f2959437e952b9db4eaeed2407424f11a4d1.tar
glibc-3ce1f2959437e952b9db4eaeed2407424f11a4d1.tar.gz
glibc-3ce1f2959437e952b9db4eaeed2407424f11a4d1.tar.bz2
glibc-3ce1f2959437e952b9db4eaeed2407424f11a4d1.zip
Cleanup of configuration options
Make several tool features mandatory and simplify the code.
Diffstat (limited to 'intl/loadinfo.h')
-rw-r--r--intl/loadinfo.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/intl/loadinfo.h b/intl/loadinfo.h
index 2c1b44cec4..52abfc3c6a 100644
--- a/intl/loadinfo.h
+++ b/intl/loadinfo.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2000, 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2000, 2002-2004, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -44,12 +44,6 @@
# define internal_function
#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
-
/* Encoding of locale name parts. */
#define XPG_NORM_CODESET 1
#define XPG_CODESET 2