am 75f43525: Merge "Always take GCC\'s definition of NULL."

* commit '75f43525550c5cad3980f7dd125cb838836790b8':
  Always take GCC's definition of NULL.
This commit is contained in:
Elliott Hughes 2012-10-01 18:18:06 -07:00 committed by Android Git Automerger
commit 39d7c6072d

View file

@ -63,13 +63,8 @@ typedef long int ssize_t;
typedef long off_t;
#endif
#ifndef NULL
#ifdef __GNUG__
#define NULL __null
#else
#define NULL 0L
#endif
#endif
#define __need_NULL
#include <stddef.h>
#define _FSTDIO /* Define for new stdio with functions. */