Merge branch 'dev' into dev

This commit is contained in:
Michele Campus
2017-12-07 22:45:28 +01:00
committed by GitHub
35 changed files with 713 additions and 548 deletions
+3
View File
@@ -44,8 +44,11 @@ static void ndpi_int_irc_add_connection(struct ndpi_detection_module_struct *ndp
}
#if !defined(WIN32)
static inline
#elif defined(MINGW_GCC)
__mingw_forceinline static
#else
__forceinline static
#endif