fix build on: define own version of ALLOCM_LG_ALIGN
authorLucian Grijincu <lucian@fb.com>
Thu, 30 Aug 2012 03:19:19 +0000 (20:19 -0700)
committerJordan DeLong <jdelong@fb.com>
Mon, 17 Sep 2012 01:27:55 +0000 (18:27 -0700)
Summary:
On --platform=gcc-4.6.2-glibc-2.13-fb the build would fail because

fbcode/third-party/gcc-4.6.2-glibc-2.13-fb/libgcc/libgcc-4.6.2/b4e37bb/include/c++/4.6.2/bits/basic_fbstring_malloc.h

defines it's own version of ALLOCM_SUCCESS & co., but not ALLOCM_LG_ALIGN :(

The '#ifdef ALLOCM_SUCCESS' check in 'folly/Malloc.h' would pass even
though we didn't include jemalloc.

Test Plan: build it

Reviewed By: philipp@fb.com

FB internal diff: D562273

folly/Malloc.h

index 2d836636a771012e4d07f7fd80674f70666e12ec..e43c2afef0ba4cfd537a92407adecb440ced994d 100644 (file)
@@ -84,7 +84,6 @@ __attribute__((weak));
 
 #define ALLOCM_ZERO    64
 #define ALLOCM_NO_MOVE 128
-#define ALLOCM_LG_ALIGN(la) (la)
 #endif
 
 #ifdef _LIBSTDCXX_FBSTRING