On Tue, 24 Feb 2015, Kevin Brott wrote:
>
> On Mon, Feb 23, 2015 at 4:53 PM, Damien Miller <djm at mindrot.org>
wrote:
>
> This should fix it:
>
> diff --git a/regress/netcat.c b/regress/netcat.c
> index 84efe11..4b8c51c 100644
> --- a/regress/netcat.c
> +++ b/regress/netcat.c
> [sniip]
>
>
>
> This patch applies cleanly against
> openssh-SNAP-20150225.tar.gz and once I remove the other err.h refreence as
> noted later (that patch doesn't apply more than the first two chunks),
the
> build on AIX gets to here before it explodes:
>
> xlc_r -O2 -qarch=ppc -qalloca -I/usr/include -I/opt/freeware/include -I.
> -I. -O2 -qarch=ppc -qalloca -I/usr/include -I/opt/freeware/include
> -DSSHDIR=\"/usr/local/etc\"
-D_PATH_SSH_PROGRAM=\"/usr/local/bin/ssh\"
> -D_PATH_SSH_ASKPASS_DEFAULT=\"/usr/local/libexec/ssh-askpass\"
> -D_PATH_SFTP_SERVER=\"/usr/local/libexec/sftp-server\"
> -D_PATH_SSH_KEY_SIGN=\"/usr/local/libexec/ssh-keysign\"
>
-D_PATH_SSH_PKCS11_HELPER=\"/usr/local/libexec/ssh-pkcs11-helper\"
> -D_PATH_SSH_PIDDIR=\"/var/run\"
-D_PATH_PRIVSEP_CHROOT_DIR=\"/var/empty\"
> -DHAVE_CONFIG_H -c regress/unittests/bitmap/tests.c -o
> regress/unittests/bitmap/tests.o
> "/usr/include/sys/mman.h", line 148.25: 1506-343 (S)
Redeclaration of mmap64
> differs from previous declaration on line 143 of
"/usr/include/sys/mman.h".
> "/usr/include/sys/mman.h", line 148.25: 1506-377 (I) The type
"long long" of
> parameter 6 differs from the previous type "long".
> make: 1254-004 The error code from the last command is 1.
Thanks for persisting :)
Does this help?
diff --git regress/unittests/bitmap/tests.c regress/unittests/bitmap/tests.c
index 5e02ca1..06c779d 100644
--- regress/unittests/bitmap/tests.c
+++ regress/unittests/bitmap/tests.c
@@ -5,6 +5,8 @@
* Placed in the public domain
*/
+#include "includes.h"
+
#include <sys/types.h>
#include <sys/param.h>
#include <stdio.h>