diff options
| author | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 17:42:13 +0000 |
|---|---|---|
| committer | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 17:42:13 +0000 |
| commit | c1b7ed509133a6716094fcf952982a76ebf70199 (patch) | |
| tree | 8699f7477c2c1f55f16d75bcce0d67278263fa78 /sdch/linux/config.h | |
| parent | 89753fdf570d25d44fe9d5f01600fa5138ca1342 (diff) | |
| download | chromium_src-c1b7ed509133a6716094fcf952982a76ebf70199.zip chromium_src-c1b7ed509133a6716094fcf952982a76ebf70199.tar.gz chromium_src-c1b7ed509133a6716094fcf952982a76ebf70199.tar.bz2 | |
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
Diffstat (limited to 'sdch/linux/config.h')
| -rw-r--r-- | sdch/linux/config.h | 2 |
1 files changed, 2 insertions, 0 deletions
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 <malloc.h> 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. */ |