generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* commit '98ae1a85b057f6534bee7e52897a80694ba8b2e1':
  bionic_auxv.h: fix #define conflict
This commit is contained in:
Nick Kralevich 2013-01-22 13:46:31 -08:00 committed by Android Git Automerger
commit 0acf4069e9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libc/private/bionic_auxv.h
View File

@ -25,8 +25,8 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#ifndef _SYS_AUXV_H_ #ifndef _PRIVATE_BIONIC_AUXV_H_
#define _SYS_AUXV_H_ #define _PRIVATE_BIONIC_AUXV_H_
#include <elf.h> #include <elf.h>
@ -36,4 +36,4 @@ extern Elf32_auxv_t* __libc_auxv;
__END_DECLS __END_DECLS
#endif /* _SYS_AUXV_H_ */ #endif /* _PRIVATE_BIONIC_AUXV_H_ */