Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-28 23:50:40 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Revert -Wno-initializer overrides

Browse Source
This commit is contained in:
pancake 2015-01-29 12:30:07 +01:00
parent aa1fa2bc62
commit 0bc397d5ce
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shlr/Makefile
View File

@ -48,12 +48,12 @@ $(SDBLIB) sdb/sdb:
cd sdb ; $(MAKE) clean
cd sdb ; \
$(MAKE) clean && \
$(MAKE) CC=${HOST_CC} CFLAGS="-fPIC ${HOST_CFLAGS} -Wno-initializer-overrides -g" && \
$(MAKE) CC=${HOST_CC} CFLAGS="-fPIC ${HOST_CFLAGS} -g" && \
cp -f src/sdb src/.sdb
cd sdb ; $(MAKE) clean
cd sdb ; $(MAKE) src/sdb-version.h
cd sdb/src ; $(MAKE) ARCH=xxx RANLIB="${RANLIB}" CFLAGS_SHARED="${CFLAGS_SHARED}" \
CC="${CC}" AR="${AR}" CFLAGS="${CFLAGS} -Wno-initializer-overrides" LDFLAGS="${LDFLAGS}" libsdb.a
CC="${CC}" AR="${AR}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" libsdb.a
${RANLIB} sdb/src/libsdb.a
cp -f sdb/src/.sdb sdb/sdb

9
shlr/sdb/src/json/js0n.c
View File

@ -3,6 +3,15 @@
// opportunity to further optimize would be having different jump tables for higher depths
#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
#pragma GCC diagnostic push
#endif
#pragma GCC diagnostic ignored "-Wunknown-pragmas"
#pragma GCC diagnostic ignored "-Wpragmas"
#pragma GCC diagnostic ignored "-Winitializer-overrides"
#pragma GCC diagnostic ignored "-Woverride-init"
#define HAVE_RAWSTR 0
#define PUSH(i) if(depth == 1) prev = *out++ = ((cur+i) - js)
#define CAP(i) if(depth == 1) prev = *out++ = ((cur+i) - (js + prev) + 1)