Skip to content

[depends] samba-gplv3: android fixes for ndk with Unified Headers #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
koying merged 1 commit into from
Aug 4, 2017
Merged

[depends] samba-gplv3: android fixes for ndk with Unified Headers #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions tools/depends/target/samba-gplv3/samba_android.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
--- lib/replace/system/network.h
+++ lib/replace/system/network.h
@@ -128,7 +128,7 @@
struct hostent *rep_gethostbyname(const char *name);
#endif

-#ifdef HAVE_IFADDRS_H
+#if defined(HAVE_IFADDRS_H) && (!defined(__ANDROID_API__) || __ANDROID_API__ >= 24)
#include <ifaddrs.h>
#endif

diff -ru lib/util/charset/iconv.c lib/util/charset/iconv.c
--- lib/util/charset/iconv.c 2013-01-29 09:49:31.000000000 +0100
+++ lib/util/charset/iconv.c 2015-03-28 08:30:53.191217266 +0100
Expand Down Expand Up @@ -87,6 +98,19 @@ diff -ru nsswitch/libwbclient/wbc_sid.c nsswitch/libwbclient/wbc_sid.c
}

wbc_status = WBC_ERR_SUCCESS;
--- nsswitch/winbind_struct_protocol.h
+++ nsswitch/winbind_struct_protocol.h
@@ -186,6 +186,10 @@
WINBINDD_NUM_CMDS
};

+#if defined(ANDROID) && defined(pw_gecos)
+#undef pw_gecos
+#endif
+
typedef struct winbindd_pw {
fstring pw_name;
fstring pw_passwd;
diff -ru source3/configure source3/configure
--- source3/configure 2013-01-29 10:21:59.000000000 +0100
+++ source3/configure 2015-03-28 08:43:34.903227582 +0100
Expand Down