diff options
| author | Nick Kralevich <nnk@google.com> | 2013-01-22 13:09:04 -0800 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2013-01-22 13:09:04 -0800 |
| commit | abc21c80563454ff1f5a04effcf4f807996d3b10 (patch) | |
| tree | a470a0bb7d043689e09d9e8f949e8a627917993f /libc/private/bionic_auxv.h | |
| parent | 02f96b9db0242711fe1dfe0713c0c4e698561da5 (diff) | |
| download | bionic-abc21c80563454ff1f5a04effcf4f807996d3b10.zip bionic-abc21c80563454ff1f5a04effcf4f807996d3b10.tar.gz bionic-abc21c80563454ff1f5a04effcf4f807996d3b10.tar.bz2 | |
bionic_auxv.h: fix #define conflict
Both libc/include/sys/auxv.h and libc/private/bionic_auxv.h
use _SYS_AUXV_H_ to see if a header file has already been included.
This prevents both of these files from being included at the same
time.
Fix this name conflict.
Change-Id: Ifaec88aa9779d784b95f8e75145117acf3d5cfc5
Diffstat (limited to 'libc/private/bionic_auxv.h')
| -rw-r--r-- | libc/private/bionic_auxv.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libc/private/bionic_auxv.h b/libc/private/bionic_auxv.h index d3b0038..69d15b6 100644 --- a/libc/private/bionic_auxv.h +++ b/libc/private/bionic_auxv.h @@ -25,8 +25,8 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -#ifndef _SYS_AUXV_H_ -#define _SYS_AUXV_H_ +#ifndef _PRIVATE_BIONIC_AUXV_H_ +#define _PRIVATE_BIONIC_AUXV_H_ #include <elf.h> @@ -36,4 +36,4 @@ extern Elf32_auxv_t* __libc_auxv; __END_DECLS -#endif /* _SYS_AUXV_H_ */ +#endif /* _PRIVATE_BIONIC_AUXV_H_ */ |