diff options
| author | Eric Andersen <andersen@codepoet.org> | 2004-02-17 11:25:03 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2004-02-17 11:25:03 +0000 |
| commit | c56735672c2f771e0c9d87480c85b72aa99aceec (patch) | |
| tree | 7ae376722c0fc46282ffd1cf49c150e4ae369fca /ldso | |
| parent | e5649e61768bfd26d48aa44076d2c1e801a3e8cb (diff) | |
Fixup support for gcc 2.95
Diffstat (limited to 'ldso')
| -rw-r--r-- | ldso/include/ldso.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/ldso/include/ldso.h b/ldso/include/ldso.h index c87bac440..6d3df05dc 100644 --- a/ldso/include/ldso.h +++ b/ldso/include/ldso.h @@ -2,6 +2,21 @@ #define _LDSO_H_ #include <features.h> + +/* Prepare for the case that `__builtin_expect' is not available. */ +#if __GNUC__ == 2 && __GNUC_MINOR__ < 96 +#define __builtin_expect(x, expected_value) (x) +#endif +#ifndef likely +# define likely(x) __builtin_expect((!!(x)),1) +#endif +#ifndef unlikely +# define unlikely(x) __builtin_expect((!!(x)),0) +#endif +#ifndef __LINUX_COMPILER_H +#define __LINUX_COMPILER_H +#endif + /* Pull in compiler and arch stuff */ #include <stdlib.h> #include <stdarg.h> @@ -20,21 +35,6 @@ #include <dl-elf.h> #include <dl-hash.h> -/* Prepare for the case that `__builtin_expect' is not available. */ -#if __GNUC__ == 2 && __GNUC_MINOR__ < 96 -#define __builtin_expect(x, expected_value) (x) -#endif -#ifndef likely -# define likely(x) __builtin_expect((!!(x)),1) -#endif -#ifndef unlikely -# define unlikely(x) __builtin_expect((!!(x)),0) -#endif -#ifndef __LINUX_COMPILER_H -#define __LINUX_COMPILER_H -#endif - - /* Global variables used within the shared library loader */ extern char *_dl_library_path; /* Where we look for libraries */ extern char *_dl_preload; /* Things to be loaded before the libs */ |