diff options
| author | Elliott Hughes <enh@google.com> | 2014-11-21 22:50:20 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-11-21 22:50:20 -0800 |
| commit | 9768d24fa096e312e472a43e13cf2867c1bf581d (patch) | |
| tree | ac5c472667de701158d5444c9f7b447cea9389a1 /liblog | |
| parent | 6fe92d1a3fb17545d82d020a3c995f32e6b71f9d (diff) | |
| download | system_core-9768d24fa096e312e472a43e13cf2867c1bf581d.zip system_core-9768d24fa096e312e472a43e13cf2867c1bf581d.tar.gz system_core-9768d24fa096e312e472a43e13cf2867c1bf581d.tar.bz2 | |
Kill LOCAL_SOCKET_NAMESPACE.
Change-Id: I18928f89f66c37be310c45ff4c05a6d47ab84f66
Diffstat (limited to 'liblog')
| -rw-r--r-- | liblog/log_read.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/liblog/log_read.c b/liblog/log_read.c index ca5a1a7..2f21a5d 100644 --- a/liblog/log_read.c +++ b/liblog/log_read.c @@ -72,7 +72,7 @@ int WEAK socket_make_sockaddr_un(const char *name, int namespaceId, switch (namespaceId) { case ANDROID_SOCKET_NAMESPACE_ABSTRACT: -#ifdef HAVE_LINUX_LOCAL_SOCKET_NAMESPACE +#if defined(__linux__) namelen = strlen(name); /* Test with length +1 for the *initial* '\0'. */ @@ -87,7 +87,7 @@ int WEAK socket_make_sockaddr_un(const char *name, int namespaceId, p_addr->sun_path[0] = 0; memcpy(p_addr->sun_path + 1, name, namelen); -#else /*HAVE_LINUX_LOCAL_SOCKET_NAMESPACE*/ +#else /* this OS doesn't have the Linux abstract namespace */ namelen = strlen(name) + strlen(FILESYSTEM_SOCKET_PREFIX); @@ -99,7 +99,7 @@ int WEAK socket_make_sockaddr_un(const char *name, int namespaceId, strcpy(p_addr->sun_path, FILESYSTEM_SOCKET_PREFIX); strcat(p_addr->sun_path, name); -#endif /*HAVE_LINUX_LOCAL_SOCKET_NAMESPACE*/ +#endif break; case ANDROID_SOCKET_NAMESPACE_RESERVED: |