Merge branch '2.1' into 2.2

2018-05-16 11:45:48 +03:00
parent ca0f37a4c0 46d1187172
commit bcc3312d8e
1 changed files with 1 additions and 1 deletions
--- a/server/core/gateway.cc
+++ b/server/core/gateway.cc
@ -21,12 +21,12 @@
 #include <execinfo.h>
 #endif
 #include <ftw.h>
-#include <getopt.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
 #include <time.h>
 #include <unistd.h>
+#include <getopt.h>

 #include <ini.h>
 #include <openssl/opensslconf.h>