diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | windows/nDPI.vcxproj | 1 | ||||
| -rw-r--r-- | windows/nDPI.vcxproj.filters | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index a92a2ffeb..fba220b03 100644 --- a/configure.ac +++ b/configure.ac @@ -170,7 +170,9 @@ AS_IF([test "x${enable_tls_sigs}" = "xyes"],[ HANDLE_TLS_SIGS="" ]) -NDPI_CFLAGS="-W -Wall -Wno-unused-parameter -Wno-unused-function -Wno-address-of-packed-member ${NDPI_CFLAGS}" +NDPI_CFLAGS="-W -Wall -Wno-unused-parameter -Wno-unused-function -Wno-address-of-packed-member ${NDPI_CFLAGS} -Wno-attributes" +#Workaround for RoaringBitmap with gcc-7 +NDPI_CFLAGS="-Wno-attributes ${NDPI_CFLAGS}" AS_IF([test "${with_lto_and_gold_linker+set}" = set], [ NDPI_CFLAGS="${NDPI_CFLAGS} -flto -fuse-ld=gold -Wno-unused-command-line-argument" diff --git a/windows/nDPI.vcxproj b/windows/nDPI.vcxproj index 5b8c7d7f4..f0bf2ff80 100644 --- a/windows/nDPI.vcxproj +++ b/windows/nDPI.vcxproj @@ -203,6 +203,7 @@ <ClCompile Include="..\src\lib\protocols\z3950.c" /> <ClCompile Include="..\src\lib\protocols\zabbix.c" /> <ClCompile Include="..\src\lib\third_party\src\ahocorasick.c" /> + <ClCompile Include="..\src\lib\third_party\src\roaring.c" /> <ClCompile Include="..\src\lib\protocols\armagetron.c" /> <ClCompile Include="..\src\lib\protocols\bgp.c" /> <ClCompile Include="..\src\lib\protocols\bittorrent.c" /> diff --git a/windows/nDPI.vcxproj.filters b/windows/nDPI.vcxproj.filters index d3a07fd79..45cdf4b4f 100644 --- a/windows/nDPI.vcxproj.filters +++ b/windows/nDPI.vcxproj.filters @@ -167,6 +167,7 @@ <ClCompile Include="..\src\lib\protocols\z3950.c" /> <ClCompile Include="..\src\lib\protocols\zabbix.c" /> <ClCompile Include="..\src\lib\third_party\src\ahocorasick.c"> + <ClCompile Include="..\src\lib\third_party\src\roaring.c"> <Filter>third_party</Filter> </ClCompile> <ClCompile Include="..\src\lib\third_party\src\ndpi_sha1.c"> |