From 6ed43a377d52e5aa2e52ab691957deff55df311e Mon Sep 17 00:00:00 2001 From: Jingyi Wei Date: Tue, 2 Feb 2016 11:55:19 -0800 Subject: [PATCH] Remove duplicate defines of HAVE_LIBJPEG and HAVE_LIBPNG. Summary: They are already defined in HHVMExtensionConfig.cmake. https://github.com/facebook/hhvm/blob/bbf1a3f443b385af20764cbbd9390605fb9de079/CMake/HHVMExtensionConfig.cmake#L811 Closes https://github.com/facebook/hhvm/pull/6572 Reviewed By: sgolemon, JoelMarcey Differential Revision: D2674509 Pulled By: sgolemon fb-gh-sync-id: 57761d58dbe1cdeda674ef8c287fd2c5d0d15cde --- hphp/runtime/ext/gd/libgd/php_compat.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hphp/runtime/ext/gd/libgd/php_compat.h b/hphp/runtime/ext/gd/libgd/php_compat.h index b4cbacb8b3c..ed5c1d12c41 100644 --- a/hphp/runtime/ext/gd/libgd/php_compat.h +++ b/hphp/runtime/ext/gd/libgd/php_compat.h @@ -34,8 +34,10 @@ // And start the blasted C stuff again extern "C" { -#define HAVE_LIBJPEG -#define HAVE_LIBPNG +#ifdef FACEBOOK +# define HAVE_LIBJPEG +# define HAVE_LIBPNG +#endif #define emalloc HPHP::req::malloc #define ecalloc HPHP::req::calloc #define efree HPHP::req::free -- 2.11.4.GIT