commit 244bee5bb6e0bc12b739c57028ac8af23a18aed0
author Nick Kralevich <nnk@google.com> Tue Jan 22 21:30:27 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 22 21:30:27 2013 +0000
tree a470a0bb7d043689e09d9e8f949e8a627917993f
parent 02f96b9db0242711fe1dfe0713c0c4e698561da5
parent abc21c80563454ff1f5a04effcf4f807996d3b10

Merge "bionic_auxv.h: fix #define conflict"

libc/private/bionic_auxv.h

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 @@
 
 __END_DECLS
 
-#endif /* _SYS_AUXV_H_ */
+#endif /* _PRIVATE_BIONIC_AUXV_H_ */