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

* commit 'e652ed30514afcf314b40c69b9cac088602a83da': bionic_auxv.h: fix #define conflict
2013-01-22 13:43:46 -08:00
parent 04afcd25a3 e652ed3051
commit 98ae1a85b0
1 changed files with 3 additions and 3 deletions
--- 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_ */