diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-09-10 14:34:15 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-09-10 14:34:15 -0400 |
| commit | 3ce1f2959437e952b9db4eaeed2407424f11a4d1 (patch) | |
| tree | db47da854c7d3bfc2c3bce4c6fc8381075ac9ec4 /intl | |
| parent | 1248c1c41508387ff282b208636737e8cdc9b5b0 (diff) | |
| download | glibc-3ce1f2959437e952b9db4eaeed2407424f11a4d1.zip glibc-3ce1f2959437e952b9db4eaeed2407424f11a4d1.tar.gz glibc-3ce1f2959437e952b9db4eaeed2407424f11a4d1.tar.bz2 | |
Cleanup of configuration options
Make several tool features mandatory and simplify the code.
Diffstat (limited to 'intl')
| -rw-r--r-- | intl/gettextP.h | 8 | ||||
| -rw-r--r-- | intl/loadinfo.h | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/intl/gettextP.h b/intl/gettextP.h index f1aa329..381e0f1 100644 --- a/intl/gettextP.h +++ b/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 diff --git a/intl/loadinfo.h b/intl/loadinfo.h index 2c1b44c..52abfc3 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 |