tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
* commit 'e652ed30514afcf314b40c69b9cac088602a83da':
  bionic_auxv.h: fix #define conflict
This commit is contained in:
Nick Kralevich 2013-01-22 13:43:46 -08:00 committed by Android Git Automerger
commit 98ae1a85b0
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
* 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_ */