commit 98ae1a85b057f6534bee7e52897a80694ba8b2e1
author Nick Kralevich <nnk@google.com> Tue Jan 22 13:43:46 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 22 13:43:46 2013 -0800
tree 5e54309f0837c34f6fdaf7651ef4b8e6497b0e2a
parent 04afcd25a3758090009d3261f4c573b8ed73e03a
parent e652ed30514afcf314b40c69b9cac088602a83da

am e652ed30: am 244bee5b: Merge "bionic_auxv.h: fix #define conflict"

* commit 'e652ed30514afcf314b40c69b9cac088602a83da':
  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_ */