From c1b7ed509133a6716094fcf952982a76ebf70199 Mon Sep 17 00:00:00 2001 From: "steveblock@chromium.org" Date: Thu, 10 May 2012 17:42:13 +0000 Subject: Update sdch's config.h for Android Avoid redefining HAVE_MALLOC_H, which is already defined in Android's AndroidConfig.h. Review URL: https://chromiumcodereview.appspot.com/10332074 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136333 0039d316-1c4b-4281-b951-d872f2087c98 --- sdch/linux/config.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sdch/linux') diff --git a/sdch/linux/config.h b/sdch/linux/config.h index 1261918..3232eae 100644 --- a/sdch/linux/config.h +++ b/sdch/linux/config.h @@ -20,6 +20,8 @@ #define HAVE_INTTYPES_H 1 /* Define to 1 if you have the header file. */ +/* Manual edit: This is defined in AndroidConfig.h. */ +#undef HAVE_MALLOC_H #define HAVE_MALLOC_H 1 /* Define to 1 if you have the `memalign' function. */ -- cgit v1.1