Merge branch 'working_master'

main.c

@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <getopt.h>
 
 #ifdef WIN32
 #include "w32util.h"