https://github.com/facebook/rocksdb
Revision ad9cf50d4de36c3409f88cb24abe3cf2888b88d3 authored by Daniel Black on 12 April 2017, 02:07:52 UTC, committed by Daniel Black on 24 May 2017, 23:21:43 UTC
Don't include malloc.h when ROCKSDB_JEMALLOC is defined
both define memalign and malloc_usable_size differently
enough for clang to complain.

Fixes compiler error:

clang++-3.9 -m64 -O3 -g -mtune=native -I /opt/ibm/java/include/ -std=c++11  -g -W -Wextra -Wall -Wsign-compare -Wshadow -Wno-unused-parameter -I. -I./include -std=c++11 -m64 -O3 -g -mtune=native -I /opt/ibm/java/include/ -std=c++11 -DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX -m64 -O3 -g -mtune=native -I /opt/ibm/java/include/ -DOS_LINUX -fno-builtin-memcmp -DROCKSDB_FALLOCATE_PRESENT -DSNAPPY -DGFLAGS=gflags -DZLIB -DBZIP2 -DLZ4 -DZSTD -DNUMA -DTBB -DROCKSDB_MALLOC_USABLE_SIZE -DROCKSDB_PTHREAD_ADAPTIVE_MUTEX -DROCKSDB_BACKTRACE -Wshorten-64-to-32 -march=native  -DROCKSDB_JEMALLOC -DJEMALLOC_NO_DEMANGLE  -isystem ./third-party/gtest-1.7.0/fused-src -DSNAPPY=1 -DLZ4=1 -DZLIB=1 -DJEMALLOC=1 -DZSTD=1 -DNUMA=1 -Woverloaded-virtual -Wnon-virtual-dtor -Wno-missing-field-initializers -c db/db_impl.cc -o db/db_impl.o
In file included from db/db_impl.cc:80:
In file included from ./table/block.h:19:
/usr/include/malloc.h:59:14: error: exception specification in declaration does not match previous declaration
extern void *memalign (size_t __alignment, size_t __size)
             ^
/usr/include/jemalloc/jemalloc.h:167:24: note: previous declaration is here
JEMALLOC_EXPORT void *  je_memalign(size_t alignment, size_t size)
                        ^
/usr/include/jemalloc/jemalloc.h:57:23: note: expanded from macro 'je_memalign'
                      ^

Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
1 parent e761279
History
Tip revision: ad9cf50d4de36c3409f88cb24abe3cf2888b88d3 authored by Daniel Black on 12 April 2017, 02:07:52 UTC
Compile error clang+jemalloc - conflicts with malloc.h
Tip revision: ad9cf50
File Mode Size
arcanist_util
buckifier
build_tools
cache
cmake
coverage
db
docs
env
examples
hdfs
include
java
memtable
monitoring
options
port
table
third-party
tools
util
utilities
.clang-format -rw-r--r-- 138 bytes
.deprecated_arcconfig -rw-r--r-- 566 bytes
.gitignore -rw-r--r-- 726 bytes
.travis.yml -rw-r--r-- 2.8 KB
AUTHORS -rw-r--r-- 247 bytes
CMakeLists.txt -rw-r--r-- 27.9 KB
CONTRIBUTING.md -rw-r--r-- 733 bytes
COPYING -rw-r--r-- 17.7 KB
DEFAULT_OPTIONS_HISTORY.md -rw-r--r-- 1.5 KB
DUMP_FORMAT.md -rw-r--r-- 763 bytes
HISTORY.md -rw-r--r-- 44.1 KB
INSTALL.md -rw-r--r-- 5.5 KB
LANGUAGE-BINDINGS.md -rw-r--r-- 712 bytes
LICENSE -rw-r--r-- 1.6 KB
Makefile -rw-r--r-- 56.8 KB
PATENTS -rw-r--r-- 1.9 KB
README.md -rw-r--r-- 1.4 KB
ROCKSDB_LITE.md -rw-r--r-- 1.0 KB
TARGETS -rw-r--r-- 18.6 KB
USERS.md -rw-r--r-- 4.9 KB
Vagrantfile -rw-r--r-- 877 bytes
WINDOWS_PORT.md -rw-r--r-- 12.5 KB
appveyor.yml -rw-r--r-- 416 bytes
src.mk -rw-r--r-- 24.7 KB
thirdparty.inc -rw-r--r-- 7.8 KB

README.md

back to top