Merge branch 'master' into portableopensmtpd-201307221453p1

15 files changed, 14 insertions, 14 deletions

diff --git a/smtpd/backends/queue_null.c b/smtpd/backends/queue_null.c
index d30fc4aa..1e507e0f 100644
--- a/smtpd/backends/queue_null.c
+++ b/smtpd/backends/queue_null.c
@@ -21,7 +21,6 @@
 #include <sys/types.h>
 
 #include <fcntl.h>
-#include <getopt.h>
 #include <stdlib.h>
 #include <unistd.h>
 
diff --git a/smtpd/backends/queue_ram.c b/smtpd/backends/queue_ram.c
index b8638e99..2906839a 100644
--- a/smtpd/backends/queue_ram.c
+++ b/smtpd/backends/queue_ram.c
@@ -22,7 +22,6 @@
 #include <sys/stat.h>
 
 #include <fcntl.h>
-#include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/smtpd/backends/queue_stub.c b/smtpd/backends/queue_stub.c
index 0cc73c2c..052d350f 100644
--- a/smtpd/backends/queue_stub.c
+++ b/smtpd/backends/queue_stub.c
@@ -20,7 +20,7 @@
 
 #include <sys/types.h>
 
-#include <getopt.h>
+#include <unistd.h>
 
 #include "smtpd-defines.h"
 #include "smtpd-api.h"
diff --git a/smtpd/backends/scheduler_ram.c b/smtpd/backends/scheduler_ram.c
index 002db007..d9a0a54b 100644
--- a/smtpd/backends/scheduler_ram.c
+++ b/smtpd/backends/scheduler_ram.c
@@ -21,12 +21,12 @@
 #include <sys/types.h>
 
 #include <err.h>
-#include <getopt.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include <unistd.h>
 
 #include "smtpd-defines.h"
 #include "smtpd-api.h"
diff --git a/smtpd/backends/scheduler_stub.c b/smtpd/backends/scheduler_stub.c
index c43ce4de..f6aa9c2d 100644
--- a/smtpd/backends/scheduler_stub.c
+++ b/smtpd/backends/scheduler_stub.c
@@ -20,8 +20,8 @@
 
 #include <sys/types.h>
 
-#include <getopt.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 #include "smtpd-defines.h"
 #include "smtpd-api.h"
diff --git a/smtpd/filters/filter_dnsbl.c b/smtpd/filters/filter_dnsbl.c
index 937c5d98..4bb2e444 100644
--- a/smtpd/filters/filter_dnsbl.c
+++ b/smtpd/filters/filter_dnsbl.c
@@ -20,11 +20,11 @@
  
 #include <sys/types.h>
 
-#include <getopt.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
-        
+#include <unistd.h>
+
 #include "smtpd-defines.h"
 #include "smtpd-api.h"
 #include "log.h"
diff --git a/smtpd/filters/filter_monkey.c b/smtpd/filters/filter_monkey.c
index 751e1893..bbf371f6 100644
--- a/smtpd/filters/filter_monkey.c
+++ b/smtpd/filters/filter_monkey.c
@@ -20,9 +20,9 @@
 
 #include <sys/types.h>
 
-#include <getopt.h>
 #include <inttypes.h>
 #include <stdio.h>
+#include <unistd.h>
 
 #include "smtpd-defines.h"
 #include "smtpd-api.h"
diff --git a/smtpd/filters/filter_stub.c b/smtpd/filters/filter_stub.c
index 527656ad..be1c2f7c 100644
--- a/smtpd/filters/filter_stub.c
+++ b/smtpd/filters/filter_stub.c
@@ -20,10 +20,10 @@
  
 #include <sys/types.h>
 
-#include <getopt.h>
 #include <inttypes.h>
 #include <stdio.h>
-        
+#include <unistd.h>
+
 #include "smtpd-defines.h"
 #include "smtpd-api.h"
 #include "log.h"
diff --git a/smtpd/filters/filter_trace.c b/smtpd/filters/filter_trace.c
index 07554544..5eb7f91c 100644
--- a/smtpd/filters/filter_trace.c
+++ b/smtpd/filters/filter_trace.c
@@ -20,9 +20,9 @@
 
 #include <sys/types.h>
 
-#include <getopt.h>
 #include <inttypes.h>
 #include <stdio.h>
+#include <unistd.h>
 
 #include "smtpd-defines.h"
 #include "smtpd-api.h"
diff --git a/smtpd/table_ldap.c b/smtpd/table_ldap.c
index 770c0764..e25d6ecf 100644
--- a/smtpd/table_ldap.c
+++ b/smtpd/table_ldap.c
@@ -21,7 +21,6 @@
 #include <sys/types.h>
 
 #include <ctype.h>
-#include <getopt.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/smtpd/table_mysql.c b/smtpd/table_mysql.c
index fdf410cd..a25d4c68 100644
--- a/smtpd/table_mysql.c
+++ b/smtpd/table_mysql.c
@@ -26,6 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include <unistd.h>
 
 #include <mysql/mysql.h>
 #include <mysql/errmsg.h>
diff --git a/smtpd/table_passwd.c b/smtpd/table_passwd.c
index b25a0fe1..db70fab3 100644
--- a/smtpd/table_passwd.c
+++ b/smtpd/table_passwd.c
@@ -21,11 +21,11 @@
 #include <sys/types.h>
 
 #include <err.h>
-#include <getopt.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "smtpd-defines.h"
 #include "smtpd-api.h"
diff --git a/smtpd/table_postgres.c b/smtpd/table_postgres.c
index 54377d6f..3b687c30 100644
--- a/smtpd/table_postgres.c
+++ b/smtpd/table_postgres.c
@@ -26,6 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include <unistd.h>
 
 #include <postgresql/libpq-fe.h>
 
diff --git a/smtpd/table_sqlite.c b/smtpd/table_sqlite.c
index 2928f0ef..7b322652 100644
--- a/smtpd/table_sqlite.c
+++ b/smtpd/table_sqlite.c
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include <unistd.h>
 
 #include "smtpd-defines.h"
 #include "smtpd-api.h"
diff --git a/smtpd/table_stub.c b/smtpd/table_stub.c
index 7a8068a5..317cf56c 100644
--- a/smtpd/table_stub.c
+++ b/smtpd/table_stub.c
@@ -20,7 +20,7 @@
 
 #include <sys/types.h>
 
-#include <getopt.h>
+#include <unistd.h>
 
 #include "smtpd-defines.h"
 #include "smtpd-api.h"