From cec5e52c7e3657a43fff9b87534bf557abc4b974 Mon Sep 17 00:00:00 2001 From: Greg Alexander Date: Sat, 25 May 2019 22:46:18 -0400 Subject: [PATCH] Now it compiles with the new NDK. --- jni/interface.c | 2 +- openssh/config.h | 1 + rsync/config.h | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/jni/interface.c b/jni/interface.c index 8d1ee19..c7699a7 100644 --- a/jni/interface.c +++ b/jni/interface.c @@ -122,7 +122,7 @@ Java_org_galexander_sshd_SimpleSSHDService_start_1sshd(JNIEnv *env_, const char *extra; if (!jni_init(env_)) { - return; + return 0; } conf_path = from_java_string(jpath); conf_shell = from_java_string(jshell); diff --git a/openssh/config.h b/openssh/config.h index 8835840..27ffa93 100644 --- a/openssh/config.h +++ b/openssh/config.h @@ -22,6 +22,7 @@ #define HAVE_SIG_ATOMIC_T 1 #define HAVE_MBLEN 1 #define HAVE_SYS_UN_H 1 +#define HAVE_ATTRIBUTE__SENTINEL__ 1 #define error(fmt, ...) fprintf(stderr, fmt, ##__VA_ARGS__) #define fatal(fmt, ...) { fprintf(stderr, fmt, ##__VA_ARGS__); cleanup_exit(255); } diff --git a/rsync/config.h b/rsync/config.h index 925dcf0..11b9707 100644 --- a/rsync/config.h +++ b/rsync/config.h @@ -74,5 +74,8 @@ #define HAVE_FCHMOD 1 #define HAVE_SETMODE 1 #define HAVE_STRUCT_STAT64 1 +#define HAVE_INET_NTOP 1 +#define MAJOR_IN_SYSMACROS 1 +#define HAVE_ASPRINTF 1 #endif /* __RSYNC_CONFIG_H */