diff options
| author |   gilles <gilles@poolp.org> | 2013-03-22 09:33:26 +0100 |
|---|---|---|
| committer | gilles <gilles@poolp.org> | 2013-03-22 09:33:26 +0100 |
| commit | 8e186a8a5d1a7f49a0a799f09dd8c04db5e7b789 (patch) | |
| tree | 61dce8176fd8d3d0688c8f59d1f9e92f69fce83f | |
| parent | Merge branch 'master' into portable (diff) | |
| parent | remove param.h from parse.y (diff) | |
| download | OpenSMTPD-8e186a8a5d1a7f49a0a799f09dd8c04db5e7b789.tar.xz OpenSMTPD-8e186a8a5d1a7f49a0a799f09dd8c04db5e7b789.zip | |
Merge branch 'master' into portableopensmtpd-201303221610p1
Conflicts:
smtpd/parse.y
| -rw-r--r-- | smtpd/parse.y | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/smtpd/parse.y b/smtpd/parse.y index 7c21185d..f33fb901 100644 --- a/smtpd/parse.y +++ b/smtpd/parse.y @@ -28,7 +28,6 @@ #include <sys/time.h> #include "sys-queue.h" #include "sys-tree.h" -#include <sys/param.h> #include <sys/socket.h> #include <sys/stat.h> #include <sys/ioctl.h> |