summaryrefslogtreecommitdiffstats
path: root/adb/sysdeps.h
diff options
context:
space:
mode:
authorJosh Gao <jmgao@google.com>2016-02-01 18:48:13 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-02-01 18:48:13 +0000
commitd18aea99746d9befed6d596521ea3aa10e07d23f (patch)
treec4379c26dfabf2511cb19ee455f33355398c2efc /adb/sysdeps.h
parentaef26bb1a4adb953f6bbd5a7e01ca964ed3b386d (diff)
parenta166e71e216dbfe4bff8dfc369b10ab08e183427 (diff)
downloadsystem_core-d18aea99746d9befed6d596521ea3aa10e07d23f.tar.gz
system_core-d18aea99746d9befed6d596521ea3aa10e07d23f.tar.bz2
system_core-d18aea99746d9befed6d596521ea3aa10e07d23f.zip
Merge changes I93287b87,I30a3eb0b
* changes: adb: add nullability specifiers to adb_client.h. adb: add adb_get_feature_set.
Diffstat (limited to 'adb/sysdeps.h')
-rw-r--r--adb/sysdeps.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/adb/sysdeps.h b/adb/sysdeps.h
index 0abade46f..3bd8bba73 100644
--- a/adb/sysdeps.h
+++ b/adb/sysdeps.h
@@ -61,6 +61,10 @@
#ifdef _WIN32
+// Clang-only nullability specifiers
+#define _Nonnull
+#define _Nullable
+
#include <ctype.h>
#include <direct.h>
#include <dirent.h>