Merge branch '2.1' into 2.2

This commit is contained in:
Markus Mäkelä
2018-05-16 11:45:48 +03:00

View File

@ -21,12 +21,12 @@
#include <execinfo.h> #include <execinfo.h>
#endif #endif
#include <ftw.h> #include <ftw.h>
#include <getopt.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <strings.h> #include <strings.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <getopt.h>
#include <ini.h> #include <ini.h>
#include <openssl/opensslconf.h> #include <openssl/opensslconf.h>