diff options
| author | hashimoto <hashimoto@chromium.org> | 2016-01-05 22:43:02 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-06 06:44:02 +0000 |
| commit | 87353a3ef3709a0668ef864093fe03ebd27711a8 (patch) | |
| tree | a0d704e05e9d5d574c12b1492a8ca716afb39c38 /chromeos | |
| parent | f2f52920c2c219eb4fcc69da82730ec1eab84880 (diff) | |
| download | chromium_src-87353a3ef3709a0668ef864093fe03ebd27711a8.zip chromium_src-87353a3ef3709a0668ef864093fe03ebd27711a8.tar.gz chromium_src-87353a3ef3709a0668ef864093fe03ebd27711a8.tar.bz2 | |
Fix errors caused by basictypes.h removal
Include sys/types.h for pid_t and uid_t.
Put linux/android/binder.h after sys/types.h as it requires pid_t and
uid_t defined.
Include stdint.h for standard int types (e.g. uint32_t)
BUG=563282
Review URL: https://codereview.chromium.org/1558943005
Cr-Commit-Position: refs/heads/master@{#367786}
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/binder/transaction_data.h | 2 | ||||
| -rw-r--r-- | chromeos/binder/transaction_data_from_driver.h | 5 | ||||
| -rw-r--r-- | chromeos/binder/util.cc | 3 | ||||
| -rw-r--r-- | chromeos/binder/util.h | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/chromeos/binder/transaction_data.h b/chromeos/binder/transaction_data.h index d43fc69..900ca08 100644 --- a/chromeos/binder/transaction_data.h +++ b/chromeos/binder/transaction_data.h @@ -5,6 +5,8 @@ #ifndef CHROMEOS_BINDER_TRANSACTION_DATA_H_ #define CHROMEOS_BINDER_TRANSACTION_DATA_H_ +#include <sys/types.h> + #include "chromeos/binder/status.h" namespace binder { diff --git a/chromeos/binder/transaction_data_from_driver.h b/chromeos/binder/transaction_data_from_driver.h index cf7837c..c2a248f 100644 --- a/chromeos/binder/transaction_data_from_driver.h +++ b/chromeos/binder/transaction_data_from_driver.h @@ -5,10 +5,11 @@ #ifndef CHROMEOS_BINDER_TRANSACTION_DATA_FROM_DRIVER_H_ #define CHROMEOS_BINDER_TRANSACTION_DATA_FROM_DRIVER_H_ -#include <linux/android/binder.h> #include <stddef.h> #include <stdint.h> -#include <unistd.h> +#include <sys/types.h> + +#include <linux/android/binder.h> #include "base/callback.h" #include "base/macros.h" diff --git a/chromeos/binder/util.cc b/chromeos/binder/util.cc index cd9802d..49736b5 100644 --- a/chromeos/binder/util.cc +++ b/chromeos/binder/util.cc @@ -4,8 +4,9 @@ #include "chromeos/binder/util.h" +#include <sys/types.h> + #include <linux/android/binder.h> -#include <stdint.h> #include "base/logging.h" diff --git a/chromeos/binder/util.h b/chromeos/binder/util.h index 461d4e0..d4e4e17 100644 --- a/chromeos/binder/util.h +++ b/chromeos/binder/util.h @@ -5,6 +5,8 @@ #ifndef CHROMEOS_BINDER_UTIL_H_ #define CHROMEOS_BINDER_UTIL_H_ +#include <stdint.h> + #include "chromeos/chromeos_export.h" namespace binder { |