diff options
author | Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> | 2016-10-11 23:06:48 +0900 |
---|---|---|
committer | Mark Wielaard <mjw@redhat.com> | 2016-10-12 15:43:14 +0200 |
commit | 60b2bf1b08c621492410b24e469b2bdf58d167d5 (patch) | |
tree | 9a9f16d5a686b42469c190a7d3b0bd245344dc48 /libcpu | |
parent | 7bf4b63a4980788e6c1969cae02f0483e79c069f (diff) | |
download | elfutils-60b2bf1b08c621492410b24e469b2bdf58d167d5.tar.gz |
lib: Provide MAX and MIN in system.h
This change also creates a new header file libeu.h to provide the
prototypes for the function of libeu. That hides the definition of function
crc32, which can conflict with zlib, from libelf. It also prevents mistakes
to refer those functions from a component which doesn't link with libeu,
such as libelf.
Signed-off-by: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
Diffstat (limited to 'libcpu')
-rw-r--r-- | libcpu/ChangeLog | 6 | ||||
-rw-r--r-- | libcpu/i386_disasm.c | 1 | ||||
-rw-r--r-- | libcpu/i386_lex.l | 2 | ||||
-rw-r--r-- | libcpu/i386_parse.y | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/libcpu/ChangeLog b/libcpu/ChangeLog index 9cce4e72..fff1d96a 100644 --- a/libcpu/ChangeLog +++ b/libcpu/ChangeLog @@ -1,3 +1,9 @@ +2015-10-11 Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> + + * i386_lex.l: Remove system.h include, add libeu.h include. + * i386_parse.y: Remove sys/param.h include, add libeu.h include. + * i386_disasm.c: Remove sys/param.h. + 2016-09-05 Mark Wielaard <mjw@redhat.com> * bpf_disasm.c: Define BPF_PSEUDO_MAP_FD if undefined. diff --git a/libcpu/i386_disasm.c b/libcpu/i386_disasm.c index ceb5164f..699dd619 100644 --- a/libcpu/i386_disasm.c +++ b/libcpu/i386_disasm.c @@ -41,7 +41,6 @@ #include <stdint.h> #include <stdlib.h> #include <string.h> -#include <sys/param.h> #include "../libebl/libeblP.h" diff --git a/libcpu/i386_lex.l b/libcpu/i386_lex.l index 1e10dd76..ef1b53b6 100644 --- a/libcpu/i386_lex.l +++ b/libcpu/i386_lex.l @@ -34,7 +34,7 @@ #include <error.h> #include <libintl.h> -#include <system.h> +#include <libeu.h> #include "i386_parse.h" diff --git a/libcpu/i386_parse.y b/libcpu/i386_parse.y index 689ba222..15a72b1f 100644 --- a/libcpu/i386_parse.y +++ b/libcpu/i386_parse.y @@ -44,8 +44,8 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <sys/param.h> +#include <libeu.h> #include <system.h> #define obstack_chunk_alloc xmalloc |